Jeff Forcier 6c4bea5673 Merge branch '1.12' into 1.13		2014-04-01 11:13:28 -07: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	Merge branch '1.12' into 1.13	2014-04-01 11:13:28 -07:00