← Back to branch summary

~frankban/charms/oneiric/buildbot-master/trunk

Viewing all changes in revision 8.

  • Committer: Francesco Banconi
  • Date: 2012-01-30 17:03:24 UTC
  • mfrom: (5.1.2 buildbot-master)
  • Revision ID: francesco.banconi@canonical.com-20120130170324-99ydnb26fcqc6h9q
Merged parent branch and resolved conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: