v2.1.0

mhw@netris.org

475772ea · Merge branch 'stable-2.0' · Apr 25, 2014

retag 2.1.0 after stable-2.0 merge