Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Mon, 23 Jul 2012 21:53:50 +0000 (16:53 -0500)
committerYanhua Sun <sun51@illinois.edu>
Mon, 23 Jul 2012 21:53:50 +0000 (16:53 -0500)
commitd179556e5efc244e22b70a8651c6f5cba55b913b
tree20effa67264e8e1ceb1982683709786648e9152d
parent11fa313451bbc8cd7ff7fcefa8dad1f78c7c300d
parent6d85c1100bc56b23a71d59722a3515f89a31f2de
Merge branch 'newManual' of charmgit:charm into newManual