Merge remote branch 'DeadZen:patch-1' master
authorILYA Khlopotov <iilyak@apache.org>
Fri, 14 Oct 2016 18:39:36 +0000 (11:39 -0700)
committerILYA Khlopotov <iilyak@apache.org>
Fri, 14 Oct 2016 18:39:36 +0000 (11:39 -0700)
commit60e7f808513b2611eb412cf641d6e7132dda2a30
treecf87fc5e316cd3ff9be5fa151c0038ab9c967682
parentf6ad55d804ac741b59fe37dd092787113847661c
parent8f0c826d3e16967f5f442dd67223ebf803a9152c
Merge remote branch 'DeadZen:patch-1'

This closes #20

Signed-off-by: ILYA Khlopotov <iilyak@apache.org>