tree f1ff09afbee1e892a256332f522e64ff724ad7f3
parent f10942de537dbd71b783f68bd9327b421756d3fb
parent c42d4688841afcf47386b2b906fcb23549e613da
author Paladox <thomasmulhall410@yahoo.com> 1522236580 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1522236609 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add bin/ to .gitignore
  Remove unused imports

Change-Id: I92514e407b97ebe87bbe8f3d974ac46090abe356