Clone
Adam Murdoch
committed
on 23 Jun 13
Fixed some merge problems.
master + 474 more