OSDN Git Service

Merge main.
authorJames Teh <jamie@jantrid.net>
Wed, 6 Oct 2010 23:23:36 +0000 (09:23 +1000)
committerJames Teh <jamie@jantrid.net>
Wed, 6 Oct 2010 23:23:36 +0000 (09:23 +1000)
commit290b67d6cce4dd4d70c019adbeff2c32e53f2143
tree15c1a6b20cbdc3bd08e84caf0d43bcfbe31d861e
parent4f2c1635387ee2d889a9fae93726bde7ce9d7275
parent7638c331a0e2ae873a31285e784f20a24f6d4d94
Merge main.
user_docs/en/changes.t2t
user_docs/en/userGuide.t2t