tree a28db8b5b9bd9ceaeaac4c3a945c115d3399e422
parent 33e0f9359e1e8094bcd88e2862d9501ba520a2c5
parent cea605b2b0053030067058e20e46330647b7123e
author Adrian Cole <adrian@jclouds.org> 1339520159 -0700
committer Adrian Cole <adrian@jclouds.org> 1339520159 -0700

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

* 'master' of github.com:jclouds/jclouds:
  Fixes TemplateBuilder.from(...) javadoc