Andrew Phillips a4e3d7ead3 Merge remote branch 'origin'
Conflicts:
	core/src/main/resources/rest.properties
2010-10-26 08:34:21 +02:00
..
2010-10-26 08:34:21 +02:00
2010-10-16 10:37:26 -05:00