SemanticMediaWiki/SemanticWatchlist — pull request #19 by JeroenDeDauw (2014-05-03 17:00:33+00:00)
Title: Merge in master from WMF gerrit

Not sure how this again ended up with a bunch of conflicts...