]> 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: 23e591d bac04b5)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 30 Mar 2015 22:55:47 +0000 (00:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 30 Mar 2015 22:55:47 +0000 (00:55 +0200)

Trivial merge
Peter's tree of IPFire 2.x