]> source.dussan.org Git - nextcloud-server.git/commitdiff
rebase on latest master
authorBjörn Schießle <schiessle@owncloud.com>
Sun, 2 Dec 2012 11:51:57 +0000 (12:51 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Sun, 2 Dec 2012 11:51:57 +0000 (12:51 +0100)

Trivial merge