comparison docs/conf.py @ 1158:0f6c97421cd9

merge stable into default
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 11 Nov 2014 15:48:02 +0000
parents 34e4e51affd1
children fc6183051112
comparison
equal deleted inserted replaced
1145:fb51113a1c08 1158:0f6c97421cd9