Merge branch 'master' of github.com:m-labs/misoc
authorSebastien Bourdeauducq <sb@m-labs.hk>
Fri, 4 Jul 2014 08:29:53 +0000 (10:29 +0200)
committerSebastien Bourdeauducq <sb@m-labs.hk>
Fri, 4 Jul 2014 08:29:53 +0000 (10:29 +0200)

Trivial merge