]> 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: 857a15f 3b9b58f)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Sun, 22 Mar 2015 17:39:26 +0000 (18:39 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sun, 22 Mar 2015 17:39:26 +0000 (18:39 +0100)

Trivial merge
Peter's tree of IPFire 2.x