{"shas":[["848ad76d69e64c26acf7314557223b3c37808f45","79e4573a4f9fd720ff6ee65301f8b77c90e19eed@gmail.com","Merge branch 'master' of http://github.com/EnderWiggin/Haven-and-Hearth-client-modified-by-Ender\n\nConflicts:\n\tsmileys.conf\n\tsrc/haven/Textlog.java","Ender Wiggin"]],"repo":"EnderWiggin/Haven-and-Hearth-client-modified-by-Ender","actor":"EnderWiggin","ref":"refs/heads/master","size":1,"head":"848ad76d69e64c26acf7314557223b3c37808f45","actor_gravatar":"aff24b39a430e4a039f687381e872469","push_id":29467840}