Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Mon, 18 Apr 2011 11:36:01 +0000 (13:36 +0200)
committerStef Walter <stefw@collabora.co.uk>
Mon, 18 Apr 2011 11:36:01 +0000 (13:36 +0200)
commitb0ae785e59ae3b2cdd7a2823acb398b407a125ae
tree5f16af5af7ab6d879ab7511db065ac87469b0f66
parentcbffb2b3b862ccfa9c8506ce58ada2895ff3be49
parent7f0913d6000175cdcb772e04854a82588585f7c8
Merge branch 'gnome-3-0'

Conflicts:
docs/reference/gcr/gcr-sections.txt
gcr/Makefile.am
gcr/gcr-library.c
docs/reference/gcr/gcr-sections.txt
gcr/Makefile.am
gcr/gcr-library.c
gcr/tests/frob-certificate.c
gcr/tests/test-certificate-chain.c