]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-998-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 11:18:21 +0000 (12:18 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Sun, 6 Jan 2013 11:18:21 +0000 (12:18 +0100)
commit7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77
tree5ecc27782038f3e20b385e0703eebbb3d0edde29
parenta867b36e7f99c648252ba2a1c04888ba21c1405f
parentda7a14e9a6cc5a388ae817a226af7fa262fe6846
Merge branch 'master' into fixing-998-master

Conflicts:
lib/helper.php
lib/helper.php