Merge commit 'rob/master' into experimental
authorDuClare <akarinotengoku@gmail.com>
Thu, 28 May 2009 11:32:00 +0000 (14:32 +0300)
committerDuClare <akarinotengoku@gmail.com>
Thu, 28 May 2009 11:32:00 +0000 (14:32 +0300)
commitd14b9039f5a385c3c838a82936a876e2f2592787
tree0ac8e22144c38b46eb3d8d64c4ae0513e4be55e6
parent84f95f1b5a985790d03daff6ee97bd3b22205684
parent06badfff71f5f2bf3ab4945e6edbd8471517f557
Merge commit 'rob/master' into experimental