Merge commit 'diet/experimental' into experimental
authorDuClare <akarinotengoku@gmail.com>
Fri, 22 May 2009 08:36:37 +0000 (11:36 +0300)
committerDuClare <akarinotengoku@gmail.com>
Fri, 22 May 2009 08:36:37 +0000 (11:36 +0300)
commit1b4d45c6f1bcc5e088716b1158f3bcf4fe8b268d
tree6f154ecab7feea79dfb4f70746cffe9aee31861a
parentaaba73a0285ca9d67f0b95893aa50dc56c64ec33
parent73dfcb6c632ecde7780e5e9bb53536b65bb0463b
Merge commit 'diet/experimental' into experimental