Merge branch 'newManual' of charmgit:charm into newManual
authorRamprasad Venkataraman <ramv@illinois.edu>
Wed, 25 Jul 2012 18:01:25 +0000 (13:01 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Wed, 25 Jul 2012 18:01:25 +0000 (13:01 -0500)
commitaf771119407be9dc5b4b99478085637657c8192c
tree788ee4d44cd6f25b0fbebafdbcef495107938ffc
parent1978eba92975b6f440f140e4b2ce05ee7ef65b6b
parent8e63904d75601788176c5dba18b1c6a376bbd7dd
Merge branch 'newManual' of charmgit:charm into newManual