Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:30:58 +0000 (19:30 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:30:58 +0000 (19:30 +0200)
commitb814906935e8f6cc1a2a6fdea4e5e725cec57ead
tree10ba20b4440618e53c00faf44c73be2cea3d692f
parentb6d336cbfe79bf837dbf89f80d4852aa58a110c4
parent012cde170c6ce8473fb6f2f162c6a51e75235376
Merge 0.9->0.10
Makefile