Ellpeck 0f95f45d3a Merge remote-tracking branch 'origin/master'		2017-01-30 17:50:21 +01:00
..
java	Fix the Ranged Collector deleting items occasionally	2017-01-30 17:50:15 +01:00
resources	Added fr_CA.lang and fixed typos in en_US and fr_FR (#604)	2017-01-29 00:11:51 +01:00