Merge commit 'upstream/0.5.0'
authorJulien Lavergne <julien.lavergne@gmail.com>
Tue, 26 Oct 2010 03:26:00 +0000 (23:26 -0400)
committerJulien Lavergne <julien.lavergne@gmail.com>
Tue, 26 Oct 2010 03:26:00 +0000 (23:26 -0400)
commit760f27b8931af2361be501366820d43d94abc2f2
treeaa868ed8bd46bb1b1c145d50feb56781cdb58a3b
parent096f31d36ecda6016ee87c36c67c1d4b21e892dd
parentae075fc4b8908b0211b6eacf3231025c9bb4da78
Merge commit 'upstream/0.5.0'