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)
commit392e198561963e3e60fb1a753ac296b1fe1b73f2
treeb3f5039c66b6b01b2728c1d4c966fc43b092890c
parent3236e1a1d5d70b668d1fa0e96b5360584e0a63ed
parentf1f22dbf6222c4899b45d9c83ccf1b6314464869
Merge tag 'upstream/1.9.4'

Upstream version 1.9.4

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