merge with stable

This commit is contained in:
Georg Brandl 2014-02-02 08:05:59 +01:00
commit fc94bee009

View File

@ -180,7 +180,7 @@ Documentation using a custom theme/integrated in a site
* SQLAlchemy: http://www.sqlalchemy.org/docs/
* tinyTiM: http://tinytim.sourceforge.net/docs/2.0/
* tipfy: http://www.tipfy.org/docs/
* Ubuntu packaging guide: http://developer.ubuntu.com/packaging/html/
* Ubuntu packaging guide: http://packaging.ubuntu.com/html/
* Werkzeug: http://werkzeug.pocoo.org/docs/
* WFront: http://discorporate.us/projects/WFront/