~jakedahn/nova/lp829687

Viewing all changes in revision 139.

  • Committer: Soren Hansen
  • Date: 2010-07-15 15:52:11 UTC
  • mfrom: (3.1.14 trunk)
  • Revision ID: soren.hansen@rackspace.com-20100715155211-4gpr1wgl1jzgr1zt
Merge with -core's diverged trunk.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: