Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
authorChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Wed, 6 Jul 2011 17:30:11 +0000 (19:30 +0200)
commite1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095
treeeb06ccd7b6bf360f13e4eaa867fe1462ccf67ef8
parenta5b0d8bf9eba230f06f2b09810cc04e0a39c58ae
parent85cbc0a08f8f0125602244b91beb1b8e45a36e3f
Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next