]> git.lizzy.rs Git - rust.git/commit
Merge branch 'pr-78'
authorManish Goregaokar <manishsmail@gmail.com>
Tue, 11 Aug 2015 17:58:06 +0000 (23:28 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Tue, 11 Aug 2015 17:58:06 +0000 (23:28 +0530)
commit2cb26126d357e2ec1a0d8d624119fe5f49a155b7
tree5c54989b11e96a80a47f2b697cb30a0025d91706
parentefdbfe0d3126b953eece0843e1177e086c594555
parent423a9666ca5c688dfd333cc7e6a93944b23a9f6f
Merge branch 'pr-78'

Conflicts:
src/lib.rs
src/lib.rs
src/misc.rs