Merge branch 'devel' of https://code.google.com/p/accounts-sso.gsignond into devel
authorJussi Laako <jussi.laako@linux.intel.com>
Tue, 30 Dec 2014 14:44:28 +0000 (16:44 +0200)
committerJussi Laako <jussi.laako@linux.intel.com>
Tue, 30 Dec 2014 14:44:28 +0000 (16:44 +0200)

Trivial merge