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)
commit223fddd97a0f8c58322788f3e0fb6eb2eb7772cf
tree99d9918660bf43d27d39a63654752d2382d3b148
parent5215ebe18a55fe1d8c498a5814d6730a3aa36c47
parentc1b27582428b8f181a40f1e36a095e23d753422d
Merge branch 'core68' into next

Conflicts:
make.sh