Merge branch 'master' of https://github.com/m-labs/migen
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Tue, 12 May 2015 14:16:24 +0000 (16:16 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Tue, 12 May 2015 14:16:24 +0000 (16:16 +0200)

Trivial merge