Merge branch 'master' into divVerent/gettextizing-the-source
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 20:25:07 +0000 (21:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 Jan 2011 20:25:07 +0000 (21:25 +0100)
commit705a214cccc6bfb5c5cd04443f9898caf7bbe6b7
tree82fac7200170572c25f51485d34acd8dee1278ee
parenta701de34321b344a9577e718e4e6c3c0182b8997
parenta0351dd36fefcce48c4467548c7d47d0aca2076e
Merge branch 'master' into divVerent/gettextizing-the-source