Merge branch 'master' of ssh://oandreyev@svn.opentaps.org/home/git/opentaps-2.git master
authorOleg Andreyev <oandreyev@opensourcestrategies.com>
Mon, 13 Aug 2012 19:55:06 +0000 (22:55 +0300)
committerOleg Andreyev <oandreyev@opensourcestrategies.com>
Mon, 13 Aug 2012 19:55:06 +0000 (22:55 +0300)
commitb7d0a16e2fd6766d7b48a20ef3951e2a6fc3b73d
tree303c74c5bb9087d840e66e4cbb945a90507e70c3
parent0ae2b4ef504a96bfcffef80e93af963b857243fc
parentc3bee83c754b838cd6aa0d7307f3305952801229
Merge branch 'master' of ssh://oandreyev@svn.opentaps.org/home/git/opentaps-2.git

Conflicts:
clients/html/note_app.html