~salvatore-orlando/neutron/quantum-api

Viewing all changes in revision 22.

  • Committer: Salvatore Orlando
  • Date: 2011-06-24 13:52:17 UTC
  • mfrom: (6.1.14 quantum-trunk)
  • Revision ID: salvatore.orlando@eu.citrix.com-20110624135217-h6uz1zu3fxxpf3wt
Merge trunk
Resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: