Merge branch 'newManual' of charmgit:charm into newManual
authorChao Mei <chaomei2@illinois.edu>
Fri, 27 Jul 2012 16:51:43 +0000 (11:51 -0500)
committerChao Mei <chaomei2@illinois.edu>
Fri, 27 Jul 2012 16:51:43 +0000 (11:51 -0500)
commit37ccd9094c7710c96b9c0fd397de565d3c21cd66
treeb1a3ecc4c48e9778d7e8404b791b765dc65aa7ae
parentb67cc19d68f09e298046c66055a94212ed5c20ed
parentf8aa5ca8b620f50b2856a1270c9205955434fa7f
Merge branch 'newManual' of charmgit:charm into newManual