]> 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: 5aa856c cce37f0)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Sep 2014 18:39:43 +0000 (20:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 24 Sep 2014 18:39:43 +0000 (20:39 +0200)

Trivial merge
Peter's tree of IPFire 2.x