{"shas":[["d11837996030c1c0e0ed67763a5fa17519e8133a","d33c80bc45d65303e33ca83108a9952b745af9ef@joy-tech.co.uk","finalizing customer logic","marcmarcmarc"],["e48cfa3c76d37a48c3b8301cf6b483afc4f326f5","d33c80bc45d65303e33ca83108a9952b745af9ef@joy-tech.co.uk","Merge branch 'master' of github.com:marcmarcmarc/kanomkrok\n\nConflicts:\n\tclient/flash/bin/Main.swf\n\tclient/flash/src/com/joytech/kamomkrok/view/components/character/Character.as","marcmarcmarc"]],"ref":"refs/heads/master","size":2,"head":"e48cfa3c76d37a48c3b8301cf6b483afc4f326f5","push_id":34281179}