Merge branch 'devel' of https://code.google.com/p/accounts-sso.libgsignon-glib into...
authorJussi Laako <jussi.laako@linux.intel.com>
Fri, 21 Mar 2014 14:02:22 +0000 (16:02 +0200)
committerJussi Laako <jussi.laako@linux.intel.com>
Fri, 21 Mar 2014 14:02:22 +0000 (16:02 +0200)
commit9e15db47a9dce6476ba126f780ef660d63585273
tree6c3efc2d64cb81ab871258607b0c7c1fda680be9
parente64c9b8c0cb961843d2f26c6b2046bb984ca67a8
parent8e26c8282b96ee4a3c3fdb6b6c5fa0342f8288b8
Merge branch 'devel' of https://code.google.com/p/accounts-sso.libgsignon-glib into devel

Conflicts:
dists/rpm/libgsignon-glib-suse.spec
dists/rpm/libgsignon-glib-tizen.spec