Merge branch 'master-new-features'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (12:06 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (12:06 +0100)
commitbe1169fac7ad3a8b7b2ed1c38a5d8a0fe4944f7e
tree5e189055ad5360a5ee1afe32f4222f561093cba8
parent7dbe05551dd73beaf9ce8b8d809c9f8e28fc0894
parentbbea8d348b7972e0b29727f328f7f4dd92f18def
Merge branch 'master-new-features'