Merge remote-tracking branch 'mfischer/nasm' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:54:28 +0000 (17:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:54:28 +0000 (17:54 +0100)
commitb339fb7f142ac96d440b0951728d194f0c2a5fc2
tree12cdb265cd026f528970e9bed63583f1b5a15622
parent32470b20b1728075af1bc641a38b98bb51e8d2b8
parent2b7fe21aa71ff782dc36e0400cc3367d2f106e47
Merge remote-tracking branch 'mfischer/nasm' into next