Merge branch 'newManual' of charmgit:charm into newManual
authorYanhua Sun <sun51@illinois.edu>
Tue, 24 Jul 2012 21:11:11 +0000 (16:11 -0500)
committerYanhua Sun <sun51@illinois.edu>
Tue, 24 Jul 2012 21:11:11 +0000 (16:11 -0500)
commit87149455f846f1c497ed00e71dbe0573c5c0e5a7
treed7b70bcfd410edabc1a7e0e632c8eb9d64143568
parent92c1fb26d188c3f8440b2d4b4e60b4db97f36dec
parentd8f37b6aedd93c81c241642102b2ffcf0398f140
Merge branch 'newManual' of charmgit:charm into newManual