[Berlin 2014] CfP closed
Merge pull request #1229 from nmesstorff/master

[Berlin 2014] CfP closed