Merge remote-tracking branch 'migen/master'
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Sat, 7 Nov 2015 11:20:50 +0000 (12:20 +0100)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Sat, 7 Nov 2015 11:20:50 +0000 (12:20 +0100)

Trivial merge