Merge branch 'project_new'
authorJean Privat <jean@pryen.org>
Fri, 7 Feb 2014 16:50:49 +0000 (11:50 -0500)
committerJean Privat <jean@pryen.org>
Fri, 7 Feb 2014 16:50:49 +0000 (11:50 -0500)

Trivial merge