Merge commit 'upstream/0.5.0'
authorIustin Pop <iusty@k1024.org>
Tue, 2 Mar 2010 23:33:54 +0000 (00:33 +0100)
committerIustin Pop <iusty@k1024.org>
Tue, 2 Mar 2010 23:33:54 +0000 (00:33 +0100)
commit48c465b4f34ba5ac72db3d0121bcb88949054822
tree55bcdafa8a8c79441060e92d724e2f20d89f4ecc
parentf6bcfa8158af2b2cb5135da192883a5f92f8701c
parent9c3db613842212aa1d1e5d85cb9cdfffa31ef085
Merge commit 'upstream/0.5.0'