Merge "f-prot isn't so open now, so might aswell not advertise it in DefaultSetttings...
authorSiebrand <s.mazeland@xs4all.nl>
Wed, 4 Jul 2012 08:12:43 +0000 (08:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 4 Jul 2012 08:12:43 +0000 (08:12 +0000)
1  2 
RELEASE-NOTES-1.20

Simple merge