4 commits

Author	SHA1	Message	Date
Joey Hess	6fe35aab87	Really fix bug that caused the assistant to make many unncessary empty merge commits.	2014-07-09 15:18:00 -04:00
EskildHustvedt	99424c47d4	Reopening	2014-07-09 00:15:19 +00:00
Joey Hess	4a66cd3f91	assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.	2014-07-05 17:12:05 -04:00
EskildHustvedt	5ace35dfb9		2014-07-05 05:15:58 +00:00