Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617 ... Conflicts: settings/ajax/changepassword.php		2013-09-23 10:39:12 +02:00
..
hooks.php	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00