Merge branch 'prepare_projects'
authorJean Privat <jean@pryen.org>
Thu, 30 Jan 2014 13:39:18 +0000 (08:39 -0500)
committerJean Privat <jean@pryen.org>
Thu, 30 Jan 2014 13:39:18 +0000 (08:39 -0500)

Trivial merge