Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Wed, 25 Aug 2010 21:32:45 +0000 (16:32 -0500)
committerAaron Becker <akbecker@gmail.com>
Wed, 25 Aug 2010 21:32:45 +0000 (16:32 -0500)
commit54d340de6cc459fd1dd9afe9e3b49f8d0f41f88e
treea5d94b86e33dfcdba2f6ede677b58fa4a908143a
parent2c3fec7ab33c24a417c68a96d64b3a7c37384d79
parenteca7fd74a8b7b72656a22566ea42c9ef271af740
Merge branch 'charm' of charmgit:charm into charm