Merge branch 'master' of gitorious.org:owncloud/mirall
authorKlaas Freitag <freitag@owncloud.com>
Wed, 15 Aug 2012 15:17:02 +0000 (18:17 +0300)
committerKlaas Freitag <freitag@owncloud.com>
Wed, 15 Aug 2012 15:17:02 +0000 (18:17 +0300)
commit3669b4333277ffcc00fea785b3337377efb8f2f7
treed684631c91bd134c422813279cb9bc2f35d6f747
parent58d75e7bfe7aceb1f4dcc72ed05bd354229ecce0
parent706b9e4e09cafc4e8bb3fc046606d4d0688c7227
Merge branch 'master' of gitorious.org:owncloud/mirall