Merge remote-tracking branch 'antono/fix-xterm-plugin'
authorTravis Swicegood <development@domain51.com>
Tue, 13 Mar 2012 14:32:11 +0000 (07:32 -0700)
committerTravis Swicegood <development@domain51.com>
Tue, 13 Mar 2012 14:32:11 +0000 (07:32 -0700)
commitc79d7b0cc867189643ed3419e18c9c896fa0a6a8
tree938112e462e7eb1386b84cfd4b603c58533ed231
parent81cea34da66ed7f889203ffd8716433fe3092342
parentf3c6300e4dc14fbca5d34cf3ebc4409fdbff8d3b
Merge remote-tracking branch 'antono/fix-xterm-plugin'