Merge tag 'upstream/1.1' into debian-debiandebian-debian
commit669b1b1f33f7ffcde5b56f5b7b1c8e4bf1bdcde8
authorPavan Kumar Sunkara <pavan.sss1991@gmail.com>
Tue, 12 Nov 2013 19:42:19 +0000 (13 01:12 +0530)
committerPavan Kumar Sunkara <pavan.sss1991@gmail.com>
Tue, 12 Nov 2013 19:42:19 +0000 (13 01:12 +0530)
tree2f5b3e3b2c6b2cdddcda7119c257944053febedf
parent1abd59af54df07afabbc101af6bd3a8b0a270347
parent093288751ae1cc80d42630e073958ab925e59c8e
Merge tag 'upstream/1.1' into debian-debian

Upstream version 1.1