Merge remote-tracking branch 'origin/gir-docbook'
authorJohan Dahlin <johan@gnome.org>
Sat, 13 Aug 2011 17:42:05 +0000 (14:42 -0300)
committerJohan Dahlin <jdahlin@litl.com>
Sat, 13 Aug 2011 17:42:05 +0000 (14:42 -0300)
commite6ff50d62ce10c9faec56f7401a5801015ed286b
tree498d3213ee4ff25c08109b495af6c11ab9188a70
parent81abc2eb63317003a11d1484e84698a37e8ec035
parentc3a1333790dd1c25c2e19b80be84f6c8a84c91d6
Merge remote-tracking branch 'origin/gir-docbook'

Conflicts:
.gitignore
tests/scanner/Regress-1.0-expected.gir
giscanner/ast.py