{"shas":[["5bbbe40d5fc707936784141e87f0454e9ba6580a","1d0ffd077a7245e22eee751d9025ada07d5c8df2@gmail.com","Merge branch 'bpellin'\n\nConflicts:\n\tAndroidManifest.xml\n\tCHANGELOG\n\tres/values/config.xml\n\tres/values/strings.xml\n\tsrc/com/keepassdroid/database/load/ImporterV3.java\n\tsrc/com/keepassdroid/search/SearchDbHelper.java","Jonathan Xavier"]],"ref":"refs/heads/master","size":1,"head":"5bbbe40d5fc707936784141e87f0454e9ba6580a","push_id":37484432}