merge from trunk
commita2125dbbe302d08c182ae8878077e2b288efe4fd
authorJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 15:32:29 +0000 (15 17:32 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 15:32:29 +0000 (15 17:32 +0200)
treefcad20861e230bb9cc4c64352258d4148c4e2428
parent98f2993e4d15fc5b57cdbe212634527c630b919d
parent0542623943803e346aec839369e399e4b0ff43ad
merge from trunk
src/xdisp.c