Jim Blake ce369c4d34 Merge branch 'maint-rel-1.6' into develop		2014-04-07 10:13:09 -04:00
..
buildutils	Fix line-endings in problem file.	2014-04-07 09:36:31 -04:00
licenser	VIVO-4 remove the license substitution code from the license scanner	2013-08-26 14:56:54 -04:00
testContentNegotiation	Adding test for content negotiation	2013-09-27 16:03:28 -04:00
testrunner	Merge branch 'maint-rel-1.6' into develop	2014-04-07 10:13:09 -04:00