Merge commit 'upstream/2.0.0beta4+20110901_git1aa4c613'
authorNeutron Soutmun <neo.neutron@gmail.com>
Sun, 18 Dec 2011 15:54:25 +0000 (22:54 +0700)
committerNeutron Soutmun <neo.neutron@gmail.com>
Sun, 18 Dec 2011 15:54:25 +0000 (22:54 +0700)
commit4ec69280868d406754fea40775a932c16cfcadda
treeda7abe8a66b91bb44ab962b4f7ef76a3e28a82fe
parent2f91c20d651081bc9a00cb248f41e55560a747f9
parent2d0a1cd0cf6ab97cb6f786824c310885aabfaed1
Merge commit 'upstream/2.0.0beta4+20110901_git1aa4c613'