diff docs/user-guide.rst @ 1618:a3da15803b7a

merge stable into default
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Feb 2016 13:18:36 +0100
parents 0683e3030316
children 83d2c9637e89
line wrap: on
line diff