Merge branch 'concurrent-cancellable'
authorStef Walter <stefw@collabora.co.uk>
Fri, 19 Aug 2011 09:21:11 +0000 (11:21 +0200)
committerStef Walter <stefw@collabora.co.uk>
Fri, 19 Aug 2011 09:21:11 +0000 (11:21 +0200)
1  2 
gio/tests/.gitignore
gio/tests/Makefile.am

Simple merge
Simple merge