Merge "Include edit summary in permalink"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 2 Jun 2014 16:53:13 +0000 (16:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 2 Jun 2014 16:53:13 +0000 (16:53 +0000)
1  2 
includes/Article.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge