← Back to branch summary

~frankban/charms/precise/juju-gui/bug-1088618-serve-releases

Viewing all changes in revision 41.

  • Committer: Francesco Banconi
  • Date: 2012-12-20 14:56:29 UTC
  • mfrom: (15.1.2 trunk)
  • Revision ID: francesco.banconi@canonical.com-20121220145629-ggytjtpfgwd3zmeo
Merged trunk and resolved conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: