Merge proposals dependent on lp://staging/~jose/charms/precise/python-moinmoin/refactor-tests

lp://staging/~jose/charms/precise/python-moinmoin/refactor-tests has no merge proposals.