Merge pull request #306 from robwilkens/master
authorMiguel de Icaza <miguel@gnome.org>
Thu, 31 May 2012 03:40:12 +0000 (20:40 -0700)
committerMiguel de Icaza <miguel@gnome.org>
Thu, 31 May 2012 03:40:12 +0000 (20:40 -0700)
commit1cd507f4e5cd5d9c501cd1f778f0bf262a88328d
tree3a6286bbea2ed6021576a9d2551a6fee75376ca8
parent3590a88381401f5cfa2c4fdc87582a66ebe5a1bf
parent9a08f3cfd4b98a2cda34a59910b7313221048f77
Merge pull request #306 from robwilkens/master

Bug # 2234 - This fixes bug as reported, but not sure if wise. - Ignores exception under specific condition