Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:36:53 +0000 (20:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 15 Jul 2013 18:36:53 +0000 (20:36 +0200)
commit774df2479dfc7f1dba314da193d62bf828bb9edf
tree941cbcc7a86ff0ea28f3a42365a4ca843d073d49
parenta0fa489f2f29aafc6a4fe9f8ad7bbdd469919241
parent8b9b6c016495d15f74ba4cebe6dd502ff11937f2
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next