Jeff Forcier 196b3cc110 Merge branch '1.12' into 1.13		2014-03-31 16:19:55 -07:00
..
_shared_static	Start fleshing out two-site setup	2014-01-21 16:15:30 -08:00
docs	Link back to WWW in docs sidebar	2014-03-31 16:19:40 -07:00
www	Expand changelog to include #292	2014-03-22 18:26:16 -07:00
shared_conf.py	Attempt to fix docs for py3	2014-03-07 18:46:40 -08:00