Merge commit 'rob/master' into experimental
authorDuClare <akarinotengoku@gmail.com>
Thu, 21 May 2009 18:49:53 +0000 (21:49 +0300)
committerDuClare <akarinotengoku@gmail.com>
Thu, 21 May 2009 18:49:53 +0000 (21:49 +0300)
commit61dc2e40656956c1be622544c2e302de740fba2c
tree63ea55352ca31eeb763a673bb8b8ca9dad9625c8
parent426e4841c5a30a20bfcd05754504f958d15a43b8
parentbe6cd893323ae0eb01ed766ec68e4a41dce6bb5c
Merge commit 'rob/master' into experimental