[MERGE]
authorsma (Tiny) <sma@tinyerp.com>
Wed, 31 Aug 2011 10:39:21 +0000 (16:09 +0530)
committersma (Tiny) <sma@tinyerp.com>
Wed, 31 Aug 2011 10:39:21 +0000 (16:09 +0530)
commitfde5d6a1486ea9843d54b72ae2f31cd2bea18a59
tree15958b2d1f7f7c04a88077c23d305aaa214c1831
parente629395daa3bd050f075a6012619d7c61ce0d801
parent5b8ad8068bac7f124071249899e91822f11f194f
[MERGE]

bzr revid: sma@tinyerp.com-20110831103921-fdpmikied597o2kk
addons/base/static/src/js/boot.js
addons/base/static/src/js/core.js
addons/base/static/src/js/views.js