projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b0a04c 6ab7955)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:48:29 +0000 (18:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:48:29 +0000 (18:48 +0200)

Trivial merge
Timo's tree of IPFire 2.x