From: Jason Woofenden <jason@jasonwoof.com>
Date: Sat, 28 Mar 2015 22:19:07 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=8365f93099bcfa6a708f3608cd3eb43c150a166e

Merge remote-tracking branch 'upstream/master'

Conflicts:
	st.c
	st.info
---

8365f93099bcfa6a708f3608cd3eb43c150a166e