tree b261b6628594a5970ae53bf72cff3bfb89c058dc
parent fbec0e44178bd8b1cb7338a9efe7c0d5edbb9f3d
parent 53e20a3e9508ed4ac29864afd6dc3fcd1a410af9
author Till Westmann <till@westmann.org> 1369081459 -0700
committer Till Westmann <till@westmann.org> 1369081459 -0700

Merge branch 'master' into westmann/docs