]> 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: 126507e ac28974)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Apr 2014 17:38:05 +0000 (19:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 27 Apr 2014 17:38:05 +0000 (19:38 +0200)

Trivial merge
Peter's tree of IPFire 2.x