Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 17 Nov 2011 14:17:01 +0000 (22:17 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 17 Nov 2011 14:17:01 +0000 (22:17 +0800)
commita69c4fdc59682579a05b157afa822f6fc9e7a336
tree02412663bba98693b67391d8b9737963dcc857c4
parentd3a9bf201b42f156d4743b8a194d0e03f41ff7ef
parentebf12a8cd724ff5136021d4b3aaa6e61531620d4
Merge branch 'master' into msvc-support-master
tests/interactive/Makefile.am