Merge branch 'master' of http://github.com/m-labs/migen
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 2 Mar 2015 22:24:48 +0000 (23:24 +0100)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 2 Mar 2015 22:24:48 +0000 (23:24 +0100)

Trivial merge