]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb3ca99 cd010e0)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into owncloud
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Oct 2013 12:27:08 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Oct 2013 12:27:08 +0000 (14:27 +0200)

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