Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Thu, 31 Dec 2009 12:40:36 +0000 (13:40 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Thu, 31 Dec 2009 12:40:36 +0000 (13:40 +0100)
commitf8d2a187d13dade92620f9e9278548742d5c9c83
treee055a2ee0b99bf96cae8200b8fa7f5baf7cfa285
parentfc25674950413fc6d224334c8c432865afd66b69
parent8c96ba3b5b8ce646c4a18708986bfe651fa5967c
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x