Merge branch 'newManual' of charmgit:charm into newManual
authorChao Mei <chaomei2@illinois.edu>
Tue, 24 Jul 2012 21:40:54 +0000 (16:40 -0500)
committerChao Mei <chaomei2@illinois.edu>
Tue, 24 Jul 2012 21:40:54 +0000 (16:40 -0500)
commitbbf150624589cee5b536df273d78810e57760814
tree1a6bfc7d2970211b953ce858a8e6b0df8a9feaf2
parent95ce30bbc5408b9fa7868073b3720498b10d7c91
parente43ea01b3c9b299a1b74d6283fed5a36fc13c9ce
Merge branch 'newManual' of charmgit:charm into newManual