]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_file_cache_updater_master
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 29 Oct 2013 16:47:33 +0000 (17:47 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 29 Oct 2013 16:47:33 +0000 (17:47 +0100)

Trivial merge