[icedtea-web: 16/16] Merge branch 'f16'

[Deepak Bhole]

commit 87e11040044664e76e1473648632a70aadbc2c38
Merge: 9c60604 4e72875
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Mon Mar 5 17:36:59 2012 -0500

    Merge branch 'f16'
    
    Updated to IcedTea-Web 1.2

 .gitignore       |    1 +
 icedtea-web.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 5135062,f4414f7..fbfbfd7
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,6 +3,5 @@@
  /icedtea-web-1.0.4.tar.gz
  /icedtea-web-1.1.1.tar.gz
  /icedtea-web-1.1.2.tar.gz
 -/icedtea-web-1.1.3.tar.gz
  /icedtea-web-1.1.4.tar.gz
+ /icedtea-web-1.2.tar.gz
diff --cc icedtea-web.spec
index 9742fbc,4b45a63..556db50
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@@ -170,8 -167,11 +170,11 @@@ exit 
  %doc COPYING
  
  %changelog
+ * Mon Mar 05 2012 Deepak Bhole <dbhole at redhat.com> 1.2-1
+ - Updated to 1.2
+ 
 -* Wed Dec 21 2011 Deepak Bhole <dbhole at redhat.com> 1.1.4-4
 -- Add patch from upstream fix for RH586194
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
  
  * Fri Nov 25 2011 Deepak Bhole <dbhole at redhat.com> 1.1.4-3
  - Resolves rhbz#757191