]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commit
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x into owncloud-7.03 owncloud-7.03
authorDaniel Weismüller <daniel.weismueller@ipfire.org>
Wed, 4 Mar 2015 14:30:28 +0000 (15:30 +0100)
committerDaniel Weismüller <daniel.weismueller@ipfire.org>
Wed, 4 Mar 2015 14:30:28 +0000 (15:30 +0100)
commit0075ede05d457280f76ea69006985ec75459efc6
tree20c858669c07bfdd4a2292078f26a7a794ba9413
parent94652b6cf98f423fc1cfad720325deda8cb49ba1
parent80b0f82fef5a75b8ebc547f8ba40c8bf5b268b73
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x into owncloud-7.03