Merge branch 'newManual' of charmgit:charm into newManual
authorLaxmikant Kale <kale@illinois.edu>
Tue, 31 Jul 2012 20:19:10 +0000 (15:19 -0500)
committerLaxmikant Kale <kale@illinois.edu>
Tue, 31 Jul 2012 20:19:10 +0000 (15:19 -0500)
commit3897c6030fc7b61146181ee4b0c90c969ad8f203
treee441c79e7787b9d7bcb7e2b43a77557e9e4b1d65
parent785880dc6461dc1aa8eaa7a603991061bb4963f9
parent23f7765c2dd0cf072bd56e2d53f61652da519be3
Merge branch 'newManual' of charmgit:charm into newManual