comparison docs/conf.py @ 746:fa87604b359c

merge stable into default
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 15 Nov 2013 16:01:40 -0500
parents 41688ca951e7
children 32936a9f4389
comparison
equal deleted inserted replaced
745:99e51aff724b 746:fa87604b359c