Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
commit601f8347ccb1e9c5e3f250ff26d4097ecd698875
treef4370e4a6f235643c5d8261f2c9327cfa1847fda
parent8667a65b4e57fd2b2c375e1b580c802385924bda
parent405d20bcb33efccd16a7164e318adeb954d7639a
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
make.sh