Merge branch 'wip-manual-2'
authorNeil Jerram <neil@ossau.uklinux.net>
Fri, 16 Apr 2010 21:26:32 +0000 (22:26 +0100)
committerNeil Jerram <neil@ossau.uklinux.net>
Fri, 16 Apr 2010 21:26:32 +0000 (22:26 +0100)
commit892cf971072ae56fa82e4f3696e76066753e5677
treef1ba795c7a53385a22b2fd6f250addb00282c71a
parent4bd4b6e67f7cdc3bd2e69e4e9692414972673335
parent0a864beb3170ab4e293a10f9a4b5c11a1aeaf722
Merge branch 'wip-manual-2'

Conflicts:

doc/ref/api-translation.texi
doc/ref/Makefile.am
doc/ref/api-i18n.texi
doc/ref/api-languages.texi
doc/ref/guile.texi