{"shas":[["08f24527b786033103348343422d5a5097829e21","63453eae1e936de143e3b9ce4c0f591e839409f4@divio.ch","Merge branch 'product_as_fk' of https://github.com/zeus/django-shop into zeus-product_as_fk\n\nConflicts:\n\tshop/models/ordermodel.py\n\tshop/tests/order.py","Chris Glass"],["2597eb7e10446d7b620b395a0b085372d9d8ac6a","63453eae1e936de143e3b9ce4c0f591e839409f4@divio.ch","Fixed migrations (we had two 0004 migrations)","Chris Glass"],["70f8c0e0c414f111184342ac8c2b4d0e5c3098e5","63453eae1e936de143e3b9ce4c0f591e839409f4@divio.ch","Merge branch 'master' of github.com:divio/django-shop","Chris Glass"]],"ref":"refs/heads/master","size":3,"head":"70f8c0e0c414f111184342ac8c2b4d0e5c3098e5","push_id":35226933}