Merge branch 'master' of gitorious.org:accounts-sso/signon-digestplugin master
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 27 Jul 2011 12:28:09 +0000 (15:28 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 27 Jul 2011 12:28:09 +0000 (15:28 +0300)
commit9c4f2d9d2835cf80802b5f321fc47b86974c653e
tree7d0bd7dfffdb770ceb6fbb31c71adc80b4ee3dd0
parent00b4b748b10dc3428594adf3be3dc4bfd62be229
parenta061815dbb3573ac631e292b16f18feb25940cb9
Merge branch 'master' of gitorious.org:accounts-sso/signon-digestplugin

Conflicts:
common-vars.pri