Viewing all changes in revision 9.

Committer: Tomi Suviola
Date: 2011-07-27 12:28:09 UTC
mfrom: <a title="Merged From 7.1.2" href="/~online-accounts/signon-plugin-digest/packaging/revision/7.1.2">(7.1.2)
Revision ID: git-v1:9c4f2d9d2835cf80802b5f321fc47b86974c653e

Merge branch 'master' of gitorious.org:accounts-sso/signon-digestplugin

Conflicts:
common-vars.pri

added added

removed removed