Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 22 Jun 2013 09:29:18 +0000 (11:29 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 22 Jun 2013 09:29:18 +0000 (11:29 +0200)
commit6a9fcb7a73510a49ebe14f951b206733b0faf132
treebad03e902342d7ad5f1b8dc8e1fc325d47c3be57
parente2f6d3f44949d242f37d76265cc841be98e81860
parent561e31c4a71b410173f6bb5da440caef2639ece6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next