Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Thu, 2 Aug 2012 23:47:30 +0000 (18:47 -0500)
committerYanhua Sun <sun51@illinois.edu>
Thu, 2 Aug 2012 23:47:30 +0000 (18:47 -0500)
commitd15ddc525ea1f585c9d79f33f01d4e113c9ae87f
treec2137c2f510a94a45efd0d46f4fde58561c00c5e
parent931a320276a25ad1d440b4bb43b833b5f8b762df
parenteec78d4076351a37d4fb1e31972b5bfc7c383f0a
Merge branch 'newManual' of charmgit:charm into newManual