Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start ... Conflicts: lib/util.php		2013-06-14 10:06:13 +02:00
..
sabre	Merge branch 'master' into move-maint-start	2013-06-14 10:06:13 +02:00