tree c72e719c561883193f6bd19f448eaac4b4307981
parent 35310d7f0458b848eec692ffc5a11c4d9cca7ee4
parent 0d0c6169a8ea7c988462623c3aae87f4867c2292
author Jenkins <jenkins@review.openstack.org> 1361897327 +0000
committer Gerrit Code Review <review@openstack.org> 1361897327 +0000

Merge "Simplify xml-json inheritance in identity"