]> 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: f0dd065 14a08a8)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 27 Jan 2015 12:33:01 +0000 (13:33 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 27 Jan 2015 12:33:01 +0000 (13:33 +0100)

Trivial merge
Peter's tree of IPFire 2.x