~roadmr/checkbox/1306255

Viewing all changes in revision 2889.

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2014-04-04 19:05:23 UTC
  • mfrom: (2888.1.8 launchpad/resource-fixes)
  • Revision ID: daniel_manrique-20140404190523-k36ukdvplj8synxt
"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: