Thalassicus/cep-bnw — pull request #164 by skodkim (2014-01-27 14:54:01+00:00)
Title: Fix for Meritocracy policy

Meritocracy unintentionally gave happiness for connected cities reduced
unhappiness from population in non-Occupied cities