Merge commit 'upstream/0.5.0'
authorIustin Pop <iusty@k1024.org>
Mon, 1 Mar 2010 20:03:12 +0000 (21:03 +0100)
committerIustin Pop <iusty@k1024.org>
Mon, 1 Mar 2010 20:03:12 +0000 (21:03 +0100)
commit600b4f0fd2cc7367947d8d0cb664c47959d08cf3
tree95c40df393cd10f0f2b0a8c99947c1e6329775ab
parent46006d86d148e37ca87407b8faaab2e7afa14135
parentafc34c5e8e5c0cd189d35824b53cc04cf62f0383
Merge commit 'upstream/0.5.0'