Merge pull request #704 from jgagnon/master
authorMiguel de Icaza <miguel@gnome.org>
Wed, 23 Sep 2015 18:42:05 +0000 (14:42 -0400)
committerMiguel de Icaza <miguel@gnome.org>
Wed, 23 Sep 2015 18:42:05 +0000 (14:42 -0400)
commit22448831bbcc3d170f80ae5e3cc02fccd39ff970
tree192e9ac313d34ebadc5e0bfc59f7662eee50b391
parent559ad5b34bc086b51af2e589b32ea2eae0f78820
parent05d7064c1c43544743a4c4e50962f5280b962306
Merge pull request #704 from jgagnon/master

Fix for #4938.