Merge branch 'replica_ft' of charmgit:charm into replica_ft
authorXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:53:25 +0000 (17:53 -0800)
committerXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:53:25 +0000 (17:53 -0800)
commitfed98c807431a86648df73411931f5daee6857af
tree92db42ebbc941d720f691da22e57f2c2d1321883
parentbfcd6f09011224e2480fc5f34664fc5c581006fc
parent75e349b067101bfdf66a3c60953f2f44a1a612c0
Merge branch 'replica_ft' of charmgit:charm into replica_ft