Merge branch 'newManual' of charmgit:charm into newManual
authorRamprasad Venkataraman <ramv@illinois.edu>
Tue, 24 Jul 2012 21:56:22 +0000 (16:56 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Tue, 24 Jul 2012 21:56:22 +0000 (16:56 -0500)
commit8c67191f5bb8b5b4c746df50056f4c60c7ac4f9a
treeece838a69baf4b3bc716b5d865338c6bc47e52c8
parentf720809e7a0d3138a6bf497853a6b3b8acf317f2
parent2b4d1f7ebfa53a61489583508a65982d674766cf
Merge branch 'newManual' of charmgit:charm into newManual