kondou 65413a95dc Merge branch 'master' into oc_avatars ... Conflicts: config/config.sample.php		2013-09-03 04:43:11 +02:00
..
config.sample.php	Merge branch 'master' into oc_avatars	2013-09-03 04:43:11 +02:00