merging in master from kpe.io
authorRuss Tyndall <russ@acceleration.net>
Fri, 9 Oct 2015 15:30:40 +0000 (11:30 -0400)
committerRuss Tyndall <russ@acceleration.net>
Fri, 9 Oct 2015 15:30:40 +0000 (11:30 -0400)
commiteeb36233c9881cd2bb141f7a3241afbe82feda8d
treef7da574b91257f423db990b17402dd576bde2eb8
parented507b70a9d910372d1378cf0a7754fc88171183
parent8b84dd8066b5792cdc5b9570a60fb72c278da677
merging in master from kpe.io
ChangeLog