Merge branch 'master' of git://gitorious.org/webos-internals/applications
authorVaughn Cato <vaughn@vaughn2.localdomain>
Sun, 26 Jul 2009 06:49:19 +0000 (02:49 -0400)
committerVaughn Cato <vaughn@vaughn2.localdomain>
Sun, 26 Jul 2009 06:49:19 +0000 (02:49 -0400)
commit5a9ba089bd8d6fd8ac4d4c4618776103bcecf0df
tree3a68a9733d59f7fa92910efc52bb34970561a2fe
parent17f713a216b285bd6cd6daf8c0001e499204b57b
parent63229a415eac51781df4e10937c8f7e32c14b6fa
Merge branch 'master' of git://gitorious.org/webos-internals/applications

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