There's one merge conflict at http://bazaar.launchpad.net/%7Egtg/gtg/trunk/annotate/head%3A/GTG/core/__init__.py#L125
There's one merge conflict at http:// bazaar. launchpad. net/%7Egtg/ gtg/trunk/ annotate/ head%3A/ GTG/core/ __init_ _.py#L125