Merge branch 'master' into flexible_attributes
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 13:57:35 +0000 (09:57 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 13:57:35 +0000 (09:57 -0400)
commit98bd3a178f3e62e5591e809ac61e07a5bf37c292
tree08e5d9b4561b1a83ca592ae95026009617b17647
parent9bbc541d5a4a8720fbfa24c081da574cb1822df7
parentbd4a5d4671708123a15b7f034508926d68ae71f4
Merge branch 'master' into flexible_attributes
admin/base.py