Thomas Müller bb6fac1102 Merge branch 'master' into contactsmanager-register ... Conflicts: lib/private/contactsmanager.php		2014-05-19 21:35:13 +02:00
..
imanager.php	Merge branch 'master' into contactsmanager-register	2014-05-19 21:35:13 +02:00