Merge tag 'upstream/1.0' into debian-debian
commitcfed93c36dc472c376fdebb5aa7547574ab8052a
authorPavan Kumar Sunkara <pavan.sss1991@gmail.com>
Mon, 11 Nov 2013 16:18:29 +0000 (11 21:48 +0530)
committerPavan Kumar Sunkara <pavan.sss1991@gmail.com>
Mon, 11 Nov 2013 16:18:29 +0000 (11 21:48 +0530)
treeb02508168b04fabc1095b0befeacba1223f2e055
parentdf05dd72b0a1392717787ede05629dce6be060af
parent6dba1c601739737574d3f0e8100804d1d6b48a0b
Merge tag 'upstream/1.0' into debian-debian

Upstream version 1.0