]> git.ipfire.org Git - people/dweismueller/ipfire-2.x.git/commitdiff
projects / people / dweismueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94652b6 80b0f82)
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)

Trivial merge
Daniel's tree of IPFire 2.x.