]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into encryption_improved_error_messages_4617
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 2 Sep 2013 12:39:45 +0000 (14:39 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 2 Sep 2013 12:39:45 +0000 (14:39 +0200)

Trivial merge