Merge remote-tracking branch 'alexis/ieee-example' into next
authorJean Privat <jean@pryen.org>
Mon, 27 May 2013 16:30:01 +0000 (12:30 -0400)
committerJean Privat <jean@pryen.org>
Mon, 27 May 2013 16:30:01 +0000 (12:30 -0400)

Trivial merge