Andrew Ingram c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets ... Conflicts: djadmin2/templates/admin2/bootstrap/model_edit_form.html		2013-05-19 19:17:51 +01:00
..
admin2/bootstrap	Merge remote-tracking branch 'origin/master' into inline-formsets	2013-05-19 19:17:51 +01:00