Berlin 2013: +1 proposal. #184

Merged
merged 2 commits into from Mar 25, 2013
Commits on Mar 25, 2013
  1. Berlin 2013: Martin Alfke's proposal.

    Jens Braeuer
    Jens Braeuer committed Mar 25, 2013
  2. Merge remote-tracking branch 'jedi4ever/master'

    Jens Braeuer
    Jens Braeuer committed Mar 25, 2013