Merge branch 'master' of ssh://git@gitorious.org/webos-internals/applications
authorRyan Hope <rmh3093@Redman.buffalo.rr.com>
Thu, 30 Jul 2009 00:42:48 +0000 (20:42 -0400)
committerRyan Hope <rmh3093@Redman.buffalo.rr.com>
Thu, 30 Jul 2009 00:42:48 +0000 (20:42 -0400)
commitf5eba737fe9474453b9cd2da2d602ed2a3d669a8
treed8522e387d858e3bc53377109f7919a33117be99
parent2264004f2396862b9fd0f0ab327ccc019bcec30d
parentbc0c4cc8250020c694da452d446d756005543b88
Merge branch 'master' of ssh://git@gitorious.org/webos-internals/applications

Conflicts:
termplugin/Makefile
org.webosinternals.terminal/app/controllers/term-assistant.js
termplugin/Makefile