Merge 0.9->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Fri, 30 Nov 2012 19:31:33 +0000 (00:31 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 30 Nov 2012 19:31:33 +0000 (00:31 +0500)
commitd6687b96a24cf138b62170c5e24b10e46f4dc798
tree7a74e39ae7ba9761b3cb17251ec1b97281a0c2fb
parentaffdd679a692ede284c4e7586ba3058ce723e099
parent9ae83d514b47d31e5b18612484f78aa6f9888449
Merge 0.9->trunk.