comparison docs/conf.py @ 1208:46a465fb2aee

merge stable into default
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 05 Mar 2015 10:52:01 -0800
parents 34e4e51affd1
children fc6183051112
comparison
equal deleted inserted replaced
1200:242792d1e40a 1208:46a465fb2aee