merge from trunk
commit91d9cdf98e11c6caf8655f327c38a123b5ff22d8
authorJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 07:41:28 +0000 (16 09:41 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 07:41:28 +0000 (16 09:41 +0200)
tree6c50918c11d4364c31042895b49191428e038a6a
parentdf15e4f6391d475acf15dcb512a28eed9964caac
parentf8eb15727ae6a5c629e27ab9755e638766b27822
merge from trunk
src/xterm.c