[Merge] lp:ubuntu/vivid-proposed/caja into lp:ubuntu/vivid/caja

[Tony]

Tony has proposed merging lp:ubuntu/vivid-proposed/caja into lp:ubuntu/vivid/caja.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/caja/vivid-proposed/+merge/329289
-- 
Your team Ubuntu branches is requested to review the proposed merge of lp:ubuntu/vivid-proposed/caja into lp:ubuntu/vivid/caja.