Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Mon, 19 May 2014 10:56:38 +0000 (12:56 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Mon, 19 May 2014 10:56:38 +0000 (12:56 +0200)
commitc10ef4bd39e3b25918067da15ba68ee76e252cf4
tree78dda5e7d7d0f7488c038f17ca33c13e122a6369
parent28b8e0ec070adeb0cb8231814d355b7e1e3f56e9
parent30b1c1c72855e469034d9f7a6d4410367fa3069c
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update