Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 12:11:18 +0000 (14:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Jun 2011 12:11:18 +0000 (14:11 +0200)
commit53803a28683e68cc2f59d676ad4ff733a9483e53
tree37c1e3adbd9cd2bc79798e36e4e5810f59fcb649
parentd823e491307129c91edb2857c5368de4eaf08d15
parent35f4e9668ec7c043f04b8167380eebde0a913e8e
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next