Merge branch 'master' into translations
commit44966cb26800a291d8f40ae0522c6226b6f1a70d
authorsmariot <smariot@gmail.com>
Mon, 10 Aug 2009 08:36:25 +0000 (10 08:36 +0000)
committersmariot <smariot@gmail.com>
Mon, 10 Aug 2009 08:36:25 +0000 (10 08:36 +0000)
tree224aae82ffc084f9c51d7cab46f7f48fd1f5b67e
parent3e3926c82b3e6bd2ef51bc20b4fe1a5f89c88d33
parentc56246b06c777fff779688ad8cf06722605ef2fa
Merge branch 'master' into translations