Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 13:17:30 +0000 (15:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 26 Jun 2011 13:17:30 +0000 (15:17 +0200)
commit96eddd7ef1606a0785c99be3141738184067da83
tree385aa3a3156a4a253deeb1f16005711a93af706b
parent4b4b895946d5366ebf091e7d6c3237512cc44063
parent38ad04851347da66b36d2120254d7c93bf03f26f
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next