Fix incomplete merging from a local branch
authorMichael M Slusarz <slusarz@curecanti.org>
Fri, 7 May 2010 21:59:12 +0000 (15:59 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Fri, 7 May 2010 22:00:34 +0000 (16:00 -0600)
commit3531e5b053d8cff1c880bfad26b1f3b1304bae2a
tree9f6d9ab19ce36dfae577e44d5d8ed0a1df6bfac9
parenta0cfa639ea8d383320cc01be3d781aebfed42bb7
Fix incomplete merging from a local branch
imp/js/fullmessage-dimp.js
imp/lib/Views/ShowMessage.php