tree 0b0d7d08d96cfcb160b3ed992286064363ed03d3
parent 0c54dbcb479d093deed90b800ed4f632049bd37a
parent 8c4e74296dcdeb52a1b735fc67fcb015bb423ff5
author Adrian Cole <adrian@jclouds.org> 1340152866 -0600
committer Adrian Cole <adrian@jclouds.org> 1340152866 -0600

Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x

* 'master' of github.com:jclouds/jclouds:
  added min-disk to compute2.clj