Merge branch 'master' of https://github.com/m-labs/migen
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 13 Apr 2015 07:37:03 +0000 (09:37 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Mon, 13 Apr 2015 07:37:03 +0000 (09:37 +0200)

Trivial merge