Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Mon, 11 Aug 2014 19:05:14 +0000 (21:05 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Mon, 11 Aug 2014 19:05:14 +0000 (21:05 +0200)
commitf5480b13dd11f35cb6792c9f3cc867a1c0cff158
tree86420a338855765d5809c913e82b0275858db8c1
parent24c6cb44e2ff3bc03c6e5eb1ca40126cca0dbd3b
parent2fc5124b7ea5dd6b7035574e68be0f6441aec77e
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
make.sh