]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Sep 2011 13:52:11 +0000 (15:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 4 Sep 2011 13:52:11 +0000 (15:52 +0200)
commit3ea9703e69f3453b147b6b02e8258775d30ee6e9
treedc69c6400041432df68ce19722e954ac7705f211
parentbb4cfcc1bf35790fdbb6c56019ba23a3367465ed
parente57d2133a3581a78b80412852dfaf68ebcffadc7
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
config/rootfiles/core/next/filelists/files
config/rootfiles/core/next/filelists/files