merged master
authordaniel <daniel.kinzler@wikimedia.de>
Thu, 2 Aug 2012 09:01:22 +0000 (11:01 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Thu, 2 Aug 2012 09:01:22 +0000 (11:01 +0200)
commitc0b50eb47d2f73cb47a8f1c2e09fb089f7319587
tree7a919722e680f57bb682abc37f1394bd42cf3f8d
parent79773839a1b83688ea51c6efa547c62058ca8410
parent69e1d12fe7e2f15a8a6caa2dcb07ccee028d153a
merged master

Change-Id: I6afafe971afb3f38fc8f1e66ba409283b8a698f8
15 files changed:
RELEASE-NOTES-1.20
includes/Article.php
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Defines.php
includes/ImagePage.php
includes/OutputPage.php
includes/WikiPage.php
includes/diff/DifferenceEngine.php
includes/installer/OracleUpdater.php
includes/parser/Parser.php
languages/Language.php
languages/LanguageConverter.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php