Bart Visscher 6b061c236d Merge branch 'master' into type-hinting ... Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php		2014-03-31 21:38:54 +02:00
..
controller.php	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00