Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 1 Jul 2014 09:11:09 +0000 (11:11 +0200)
commit8e112a784156513c53d97511de528bc2d73f2d11
tree645d308f7abd374ddf103d3f5d59f2f3de97dfc3
parent94d84c7fbc46b39698aa8968afca5be2e3ea5e4d
parenta788e50410b204d4ef1f436fbd25fc67f792cd29
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update