Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:54 +0000 (18:51 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:54 +0000 (18:51 +0200)
commitad6b3bd660bf8ecce28c4a289dc0d4b367b4376f
tree5b7f0c3810446e762764ecb79c927fcb0329126e
parent00269c4c8c235aaaa86ebea41e1b42d27b880c97
parent002819372f64daf13f5ea20367e4477fa3783328
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next