[libpeas/f16: 3/4] Merge branch 'master' into f16

[Ignacio Casal Quinteiro]

commit ceda3802e8495db4af3e6d90b133322c710cec15
Merge: 257f2b6 40d83b3
Author: Ignacio Casal Quinteiro <icq at gnome.org>
Date:   Sun Aug 28 21:51:45 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	libpeas.spec

 .gitignore   |    1 +
 libpeas.spec |   10 +++++++---
 sources      |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc libpeas.spec
index 59a5cde,29a3a80..7fb3e8b
--- a/libpeas.spec
+++ b/libpeas.spec
@@@ -105,12 -95,10 +105,16 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/glade/catalogs/libpeas-gtk.xml
  
  %changelog
+ * Tue Aug 23 2011 Adam Williamson <awilliam at redhat.com> - 1.1.2-1
+ - Update to 1.1.2
+ - bump BR to pygobject3-devel
+ 
 +* Wed Aug 03 2011 Bastien Nocera <bnocera at redhat.com> 1.1.1-3
 +- Another attempt at building against the latest gjs
 +
 +* Wed Aug 03 2011 Bastien Nocera <bnocera at redhat.com> 1.1.1-2
 +- Rebuild for newer gjs
 +
  * Tue Jul 26 2011 Matthias Clasen <mclasen at redhat.com> - 1.1.1-1
  - Update to 1.1.1