Merge from trunk

diff --cc configure.ac
index 306dd2bd57a08bbeea05b19e841b859d9fbdf15d,306dd2bd57a08bbeea05b19e841b859d9fbdf15d..cfac75e202e5c7bbfbe27e51c7a0d3b101653382
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,6 -1,6 +1,6 @@@
  dnl Process this file with autoconf to produce a configure script.
  
--AC_INIT(lightdm, 1.11.0)
++AC_INIT(lightdm, 1.11.1)
  AC_CONFIG_MACRO_DIR(m4)
  AC_CONFIG_HEADER(config.h)
  AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])

diff --cc debian/changelog
index 814252e5e6b0a02f0dbfa9923bb0e266ec74545b,7d518b507d1e90d8009e9f8a34e79738dda5776f..58bbe70a40467a6e40ce2d0de2b10c19569fd4e6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,27 @@@
- lightdm (1.11.0-0ubuntu1) UNRELEASED; urgency=medium
++lightdm (1.11.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Add lightdm_greeter_set_resettable
 +
 + -- Michael Terry <mterry@ubuntu.com>  Mon, 28 Apr 2014 09:42:14 -0400
 +
+ lightdm (1.11.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release:
+     - When switching to an existing session refresh PAM credentials and end
+       session cleanly so no resources leak. (LP: #1296276)
+     - Support new standard DesktopNames field in session files
+     - Set XDG_SESSION_TYPE and XDG_SESSION_DESKTOP as used by systemd
+     - Emit DBus PropertiesChanged when Sessions/Seats properties change. Also
+       add SessionAdded/SessionRemoved signals to Seat interface
+ 
+   [ Harald Sitter ]
+   * Add pam_kwallet to pam configs. (LP: #1305307)
+   
+   [ Martin Pitt ]
+   * Add systemd integration
+ 
+  -- Robert Ancell <robert.ancell@canonical.com>  Mon, 28 Apr 2014 10:32:37 +1200
+ 
  lightdm (1.10.0-0ubuntu3) trusty; urgency=medium
  
    * debian/patches/06_apparmor_chromium_updates.patch: allow oxide based

diff --cc debian/liblightdm-gobject-1-0.symbols
index 20cbc9e46af7ae05a9235528e7179a5999256b05,e9afdffa6de7da4992e3a85ddc6b736a175389d7..ba70fcf1914c6751c578f9ad5844775ef32cd20f
--- 1/debian/liblightdm-gobject-1-0.symbols
--- 2/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@@ -37,7 -37,6 +37,7 @@@ liblightdm-gobject-1.so.0 liblightdm-go
   lightdm_greeter_new@Base 0.9.2
   lightdm_greeter_respond@Base 0.9.2
   lightdm_greeter_set_language@Base 0.9.8
-  lightdm_greeter_set_resettable@Base 1.11.0
++ lightdm_greeter_set_resettable@Base 1.11.1
   lightdm_greeter_start_session_sync@Base 0.9.2
   lightdm_hibernate@Base 0.9.2
   lightdm_language_get_code@Base 0.9.2