Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Thu, 23 Oct 2014 18:53:24 +0000 (20:53 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Thu, 23 Oct 2014 18:53:24 +0000 (20:53 +0200)
commit74381c58f9b1bd895632d1630998e1e7c23fb1bb
tree0edf1ad6ccf12fdfe00c3e7a04f8a31970e35711
parente823d548024ba9cf5d26f58afd34c12ebc7aab1a
parentad929675747de68e41b3d013858e42731bf904c2
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
make.sh