merge from trunk
commit2676aa6d82f3b92f060daa088cffbfdb4c56904d
authorJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 10:55:50 +0000 (16 12:55 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 16 Sep 2013 10:55:50 +0000 (16 12:55 +0200)
treed78196d4cb02b9610064c8864d78c80e9f7d18ae
parent2386911380e1261d50a3eb323853a711c60fcac0
parent61582e6aadc24dda730055d9907e7c053dd6218b
merge from trunk
src/xterm.c