Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 14:08:42 +0000 (16:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 14:08:42 +0000 (16:08 +0200)
commit07e1b6c0afaf2cc7ee42c6d7a2a58bfda5d33af0
treed31fe90f3e4bcc54ff1ea04ce6e144a9b7b52963
parenta4d24f90525ff980c36decfda4755777f3974004
parent0a11f8761ae9464e6321e2259899c3d5ec71a7a4
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next