Merge pull request #1084 from crrodriguez/master
authorDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 06:46:48 +0000 (08:46 +0200)
committerDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 06:46:48 +0000 (08:46 +0200)
commitcbb14ca063e5b3edaa7b6b90f35b40fd07362acb
tree147cc03fb7bbce320ffa200973cd4f6176d44ba3
parentdd64f53175816b9597a7b1efc21e4df4baf94c81
parent0ba793fb8b2888e0c340fc6f054ef5e910fe48f0
Merge pull request #1084 from crrodriguez/master

misc bugfixes