~bac/charms/oneiric/buildbot-master/bbm-cleanup

Viewing all changes in revision 24.2.2.

  • Committer: Benji York
  • Date: 2012-02-10 21:29:42 UTC
  • mfrom: (25 trunk)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: benji@benjiyork.com-20120210212942-99yhsb8ozuy8itr5
merge from trunk and fix conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: