Merge branch 'master' of git://gitorious.org/webos-internals/applications
authorVaughn Cato <vaughn@vaughn2.localdomain>
Thu, 30 Jul 2009 05:39:52 +0000 (01:39 -0400)
committerVaughn Cato <vaughn@vaughn2.localdomain>
Thu, 30 Jul 2009 05:39:52 +0000 (01:39 -0400)
commit6f5044c43235132b4731da29d576a47ff040797b
tree7d5e15ffba912f7adbc7d561a23555724054579b
parent0dad05b2365da15ccc8241ab2501f4b43eaec270
parent6bf6872322a21f73dd683da8511987d45552c102
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