magit-log-oneline-re: fix for orphaned branches

Fixes #1556.
Merge branch 'master' into next

Conflicts:
	magit.el

Which was resolved by moving the change to magit-log.el
where the respective code lives now.