Merge branch 'master' of gitorious.org:owncloud/mirall
authorKlaas Freitag <freitag@owncloud.com>
Tue, 14 Aug 2012 09:23:45 +0000 (12:23 +0300)
committerKlaas Freitag <freitag@owncloud.com>
Tue, 14 Aug 2012 09:23:45 +0000 (12:23 +0300)
commite975ec620085dddeac875e08e4d30b7f28e176ea
tree4d4a9a068f62ecd3feba64b41d2dba5aede49e9b
parent6b98958de66e500efb44aadd0e4c258057f82a91
parent4e62abe5424e6221b3ec05202dc24d4b8a8a1128
Merge branch 'master' of gitorious.org:owncloud/mirall