Michael Nutt efb5d4e0cf Merge remote-tracking branch 'drone/master' into fail-pending-on-startup ... Conflicts: cmd/droned/drone.go		2014-04-01 15:32:43 -04:00
..
drone	added revision number to drone binary, per issue #230	2014-03-28 12:36:38 -07:00
droned	Merge remote-tracking branch 'drone/master' into fail-pending-on-startup	2014-04-01 15:32:43 -04:00