Merge tag 'upstream/1.9.4'
authorRitesh Raj Sarraf <rrs@debian.org>
Mon, 30 Jun 2014 08:15:52 +0000 (13:45 +0530)
committerRitesh Raj Sarraf <rrs@debian.org>
Mon, 30 Jun 2014 08:15:52 +0000 (13:45 +0530)
Upstream version 1.9.4

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


Trivial merge