some merge fixes per comments on r53282
authorMichael Dale <dale@users.mediawiki.org>
Wed, 15 Jul 2009 01:02:13 +0000 (01:02 +0000)
committerMichael Dale <dale@users.mediawiki.org>
Wed, 15 Jul 2009 01:02:13 +0000 (01:02 +0000)
commit5dc0aa752d15c7e39f69f730edc3a0504a5ca5bf
tree98218352c9ace0f1364637315dc1648575305405
parentde7fa9061b7a892e83e1291316272a9130fe9195
some merge fixes per comments on r53282
RELEASE-NOTES
js2/mwEmbed/libAddMedia/remoteSearchDriver.js
skins/MonoBook.php
skins/common/wikibits.js
skins/monobook/KHTMLFixes.css [deleted file]