]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c7bfb1 513c321)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Mar 2014 22:42:57 +0000 (23:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Mar 2014 22:42:57 +0000 (23:42 +0100)

Trivial merge
Peter's tree of IPFire 2.x