projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32470b2 2b7fe21)
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)

Trivial merge
Peter's tree of IPFire 2.x