kondou 65413a95dc Merge branch 'master' into oc_avatars 11 years ago
..
config.sample.php 65413a95dc Merge branch 'master' into oc_avatars 11 years ago