summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-08-23 16:43:25 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-08-23 16:43:25 -0400
commit41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d (patch)
tree62edd01a7f1b95dee621b6129aa8fdcbf8a34c9e /bin
parent35a08780c41ece1b47b2ded98c061b103a400fea (diff)
downloadnova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.tar.gz
nova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.tar.xz
nova-41e2e91ccfb1409f1ea47d92a9d15f47ab37e65d.zip
Merge fail
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions