[berlin 2014] CfP is now closed
Merge pull request #1220 from lenniboy/master

[berlin 2014] CfP is now closed