Merge branch 'master' into trust-store
authorStef Walter <stefw@collabora.co.uk>
Mon, 13 Dec 2010 18:58:43 +0000 (18:58 +0000)
committerStef Walter <stefw@collabora.co.uk>
Mon, 13 Dec 2010 18:58:43 +0000 (18:58 +0000)
commit8de6a97ebb06217dd1f7e76de897298ae12fb51f
tree05b86e53b6ccd98b346a7a6d8d516137446c4bde
parent14526f568cb9acb177366792465bf8adcaf68956
parentbae8a84bedd067dc04dadab53cc9eed63244dab8
Merge branch 'master' into trust-store
egg/egg-asn1x.c
gcr/tests/unit-test-parser.c