Merge branch 'master' of gitorious.org:owncloud/mirall
authorKlaas Freitag <freitag@owncloud.com>
Mon, 6 Aug 2012 14:44:53 +0000 (17:44 +0300)
committerKlaas Freitag <freitag@owncloud.com>
Mon, 6 Aug 2012 14:44:53 +0000 (17:44 +0300)
commit01ec65441e8c6f34f2c699933ba13e4170ad1b50
tree70c9a0c6f9919e0d6162cebccbc5d509f8e2c7ef
parent80f2699c8010628240540b82660454fb9bd446f2
parent5d6c9339f8818cded841d87e9257a49de0d38449
Merge branch 'master' of gitorious.org:owncloud/mirall