Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into...
authorKlaas Freitag <freitag@owncloud.com>
Thu, 26 Jul 2012 08:45:30 +0000 (11:45 +0300)
committerKlaas Freitag <freitag@owncloud.com>
Thu, 26 Jul 2012 08:45:30 +0000 (11:45 +0300)
commit90c4e422d8647fab94eb65bcae032ae017a8853c
tree4e5679f741375637883a60482a7aa0f57796f760
parenta89f8fd2ce2301585f89ada33de74dc9fe94b617
parent9c64b5e753ce06411ea3b291fc97946c816652de
Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7