]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into move-maint-start
authorThomas Mueller <thomas.mueller@tmit.eu>
Fri, 14 Jun 2013 08:06:13 +0000 (10:06 +0200)
committerThomas Mueller <thomas.mueller@tmit.eu>
Fri, 14 Jun 2013 08:06:13 +0000 (10:06 +0200)
commitc8564c07955ead3e85daa67e1871a2c41df3a6d5
tree134c228f43e641d34fbf342df2745ece43580fee
parent0a29d2029a719d42f347edb95bd6486c2ab842a8
parent6c534c8165d3c3fba64e3cf5c05993a84733eef7
Merge branch 'master' into move-maint-start

Conflicts:
lib/util.php
lib/base.php
lib/util.php