Merge branch 'test_platform'
authorJean Privat <jean@pryen.org>
Fri, 14 Mar 2014 17:13:34 +0000 (13:13 -0400)
committerJean Privat <jean@pryen.org>
Fri, 14 Mar 2014 17:13:34 +0000 (13:13 -0400)

Trivial merge