From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 29 Sep 2014 18:06:18 +0000 (-0700)
Subject: Merge tag 'upstream/1.2.17' into debian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=13dc14533bd045f20d1be89e0c08f3e6c9d74462;p=rsem.git

Merge tag 'upstream/1.2.17' into debian

Upstream version 1.2.17
---

13dc14533bd045f20d1be89e0c08f3e6c9d74462