Merge tag 'upstream/1.9.3'
authorRitesh Raj Sarraf <rrs@debian.org>
Tue, 15 Apr 2014 09:21:13 +0000 (14:51 +0530)
committerRitesh Raj Sarraf <rrs@debian.org>
Tue, 15 Apr 2014 09:21:13 +0000 (14:51 +0530)
Upstream version 1.9.3

* tag 'upstream/1.9.3':
  Imported Upstream version 1.9.3


Trivial merge