From: Bjoern Schiessle Date: Mon, 30 Sep 2013 13:08:53 +0000 (+0200) Subject: Merge branch 'master' into encryption_improved_error_messages_4617 X-Git-Tag: v6.0.0alpha2~104^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae;p=nextcloud-server.git Merge branch 'master' into encryption_improved_error_messages_4617 --- 4d79e7e6733d06da6f4d7f0c44ef95a2a96c4aae