2 commits

Author	SHA1	Message	Date
Aaron L	85ff9a797a	Merge conflict resolution (late)	2016-06-27 00:02:10 -07:00
Patrick O'brien	4412026e63	Change testmain config load to viper & vala	2016-06-27 14:53:23 +10:00