]> source.dussan.org Git - nextcloud-server.git/commitdiff
merged
authorBernhard Posselt <nukeawhale@gmail.com>
Fri, 22 Mar 2013 23:40:46 +0000 (00:40 +0100)
committerBernhard Posselt <nukeawhale@gmail.com>
Fri, 22 Mar 2013 23:40:46 +0000 (00:40 +0100)

Trivial merge