Merge branch 'gseal'

diff --cc configure.ac
index 859c94a701643c8787ed2390ef13b6aec2270e44,b6539c13de7e114e4aa848c74bef91e531c5f451..8e09f4dea4354f3f7a539ab347868f03b8ce32bd
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -30,9 -30,9 +30,9 @@@ AC_COPYRIGHT(
  
  # Minimal version required
  GLIB_REQUIRED=2.22.0
- GTK_REQUIRED=2.20.0
+ GTK_REQUIRED=2.21.2
  GCONF_REQUIRED=1.2.0
 -TELEPATHY_GLIB_REQUIRED=0.11.6
 +TELEPATHY_GLIB_REQUIRED=0.11.7
  TELEPATHY_LOGGER=0.1.1
  ENCHANT_REQUIRED=1.2.0
  ISO_CODES_REQUIRED=0.35

diff --cc libempathy-gtk/empathy-contact-list-view.c
Simple merge