[MERGE] Stacked branches UI part 2 - branch

[Martin Pool]

Martin Pool has voted tweak.
Status is now: Conditionally approved


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C484E2D51.50909%40internode.on.net%3E