Merge remote-tracking branch 'brisby/django1.4' into django1.4
authorDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 21:53:56 +0000 (14:53 -0700)
committerDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 21:53:56 +0000 (14:53 -0700)
commitb352bcebfc6c74f84d65a05c8cdbfb55d94d029c
tree29ad62077e3bd9d7b17043c5d1e0bcab3c027e98
parentd3805853ee6fde6a1f18dde68d5f4c132d28e9bf
parentca137094e039c414d3d110f48f169a4afe51f2f1
Merge remote-tracking branch 'brisby/django1.4' into django1.4