]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into remove_unused_vars
authorFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 18:29:09 +0000 (20:29 +0200)
committerFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 18:29:09 +0000 (20:29 +0200)

Trivial merge