Merge branch 'devel' of https://code.google.com/p/accounts-sso.gsignond into devel
authorJussi Laako <jussi.laako@linux.intel.com>
Tue, 29 Jul 2014 13:11:32 +0000 (16:11 +0300)
committerJussi Laako <jussi.laako@linux.intel.com>
Tue, 29 Jul 2014 13:11:32 +0000 (16:11 +0300)
commitb5af37331f9da96bbfa1bc1f30e571c3769b1b44
tree5964fffcf4d1a8ffd4a2f4350eec9511552611d7
parent60a98b4de4674fcce8eda612582c1b7a0001f758
parent223e97eb9de7afd7699d5dadec6e0370617bff57
Merge branch 'devel' of https://code.google.com/p/accounts-sso.gsignond into devel

Conflicts:
dists/debian/changelog
dists/debian/changelog