Jeff Forcier 41d7339992 Merge branch '1.10' into 1.11 ... Conflicts: sites/www/changelog.rst		2014-02-11 14:23:50 -08:00
..
_shared_static	Start fleshing out two-site setup	2014-01-21 16:15:30 -08:00
docs	Start fleshing out two-site setup	2014-01-21 16:15:30 -08:00
www	Merge branch '1.10' into 1.11	2014-02-11 14:23:50 -08:00
shared_conf.py	Simplify www page footer.	2014-02-03 14:10:23 -08:00