Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)
commitf66615b722a8527aecfa7a6f2a74bb55204fb16b
treea511a369758c62847049b30cc392a8bad58934ba
parent33c0f26a27afd75090e04f0606616ec32487718c
parentbc7ab7b9a7adf30ba2b0935ace635a296a2b9eca
Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'