tree b34cc747c7893b891486d600dc842dffcbee0af8
parent a3af113deac69aa848df8da7eaf2ee79fe903eb0
parent a6765dcb5ee8600ba9262e73441854ddb5c67a76
author Till Westmann <westmann@gmail.com> 1396388979 -0700
committer Till Westmann <westmann@gmail.com> 1396388979 -0700

Merge branch 'master' into westmann/cleanup