comparison docs/concepts.rst @ 1579:4f83b2d2d20d

merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 03 Jan 2016 16:47:57 +0100
parents c3ecf6871872
children 803d32f4e498
comparison
equal deleted inserted replaced
1576:526253198860 1579:4f83b2d2d20d