GitHub PushEvent at 2014-05-02 18:45:36
Repository: olsrd
Actor: jheretic
Payload: {"shas":[["c225318685067166d127a6929b0304fa066a9133","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@benwest.name","Merge remote-tracking branch 'olsr/release-0.6.6' into commotion\n\nConflicts:\n\tCHANGELOG\n\tMakefile\n\tgui/win32/Inst/installer.nsi\n\tgui/win32/Main/Frontend.rc\n\tmake/hash_source.sh","ben",true],["41b9ad3c1f019cf8bd8b8c336cf23e3a1dd0a41e","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@benwest.name","Upating Makefiles for commotion-specific customizations","ben",true],["eba27d82a391d928fdb48a18c63090abe391c6cb","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@benwest.name","added mdns to Android target in Makefile","ben",true],["adf005e4a419851752db9d1ff20b8636dea0056b","6735552445c353d3ea69863270295f8ce4deb09d@chambana.net","Merge pull request #22 from westbywest/commotion\n\nMerge remote-tracking branch 'olsr/release-0.6.6' into commotion. Tested by @jheretic.","Josh King",true]],"size":4,"ref":"refs/heads/commotion","head":"adf005e4a419851752db9d1ff20b8636dea0056b"}