I just tried merging it against lp:activity-log-manager locally and it went
fine. It'd also show conflicts here if there were some.
I've merged the branch against tip and updated the references in POTFILES.in.
make distcheck is now working fine locally.
Your team Activity Log Manager is subscribed to branch lp:activity-log-manager.
Mailing list: https://launchpad.net/~zeitgeist
Post to : firstname.lastname@example.org
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp