]> 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: 7a35d10 61466ab)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:21:18 +0000 (12:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 10:21:18 +0000 (12:21 +0200)

Trivial merge
Peter's tree of IPFire 2.x