Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Thu, 21 Apr 2011 07:37:58 +0000 (09:37 +0200)
committerStef Walter <stefw@collabora.co.uk>
Thu, 21 Apr 2011 07:37:58 +0000 (09:37 +0200)
commitd462576ced933c6cc0e1794c1267c4230cae935d
tree38196ee6e50939e14b9506c9cd40b102dd04e2db
parent74efd547976f0406d1f6531ea49be240dd0d3813
parent43f8ea7333b69e5a644be100499f9744d288f199
Merge branch 'gnome-3-0'
gcr/tests/Makefile.am
gcr/tests/frob-certificate.c