Merge commit 'refs/merge-requests/4' of git://gitorious.org/owncloud/mirall into...
authorKlaas Freitag <freitag@owncloud.com>
Thu, 26 Jul 2012 08:51:56 +0000 (11:51 +0300)
committerKlaas Freitag <freitag@owncloud.com>
Thu, 26 Jul 2012 08:51:56 +0000 (11:51 +0300)
commiteb83604995a4df4d55458bfdc2ec876c83043e0e
treeaeff0dc37f109428981edb3e429c53aedb20b2c3
parent90c4e422d8647fab94eb65bcae032ae017a8853c
parent047e2b3a4a058d3a26a4f4fa8302a76d93eb9728
Merge commit 'refs/merge-requests/4' of git://gitorious.org/owncloud/mirall into merge-requests/4