]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5215ebe c1b2758)
Merge branch 'core68' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 9 Mar 2013 13:10:36 +0000 (14:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 9 Mar 2013 13:10:36 +0000 (14:10 +0100)
Conflicts:
make.sh


Trivial merge
IPFire 2.x development tree