Merge branch 'master' of https://github.com/m-labs/migen
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 22 Jul 2015 19:46:23 +0000 (21:46 +0200)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 22 Jul 2015 19:46:23 +0000 (21:46 +0200)

Trivial merge