Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:47:36 +0000 (18:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:47:36 +0000 (18:47 +0200)
commit6cdde6c0bb08508cbbbc9fe430421098e1e1999f
treecea0314d69aa4e3cb376e824626d83417ebecf34
parent26dfc86a7be473138c60e1a869e51b30db346a0f
parent83803caf386c3a7fd55215ecad348131be56bba6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next