Merge pull request #2764 from akallabeth/pull_fixes
authorMartinHaimberger <martin.haimberger@gmail.com>
Fri, 3 Jul 2015 11:04:37 +0000 (13:04 +0200)
committerMartinHaimberger <martin.haimberger@gmail.com>
Fri, 3 Jul 2015 11:04:37 +0000 (13:04 +0200)
commit358289fb5130fe46cc2f3cbd93c5e2255c890415
tree0fd27a556b49faa892feaf6769b9a095a49a2a16
parent282f15795d20b440a28337205ea37ebf8560c7f8
parent40a7f2c9958db2c1b83cd03665798e066451fc7b
Merge pull request #2764 from akallabeth/pull_fixes

Pull fixes