From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 22 Sep 2014 19:58:38 +0000 (+0200)
Subject: Merge tag 'upstream/1.1.2'
X-Git-Tag: debian/1.1.3-1ppautopic1~6
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=9aa9c8d3823d79755ddd1aa49b9af6198e24d4e2;hp=-c

Merge tag 'upstream/1.1.2'

Upstream version 1.1.2

Conflicts:
	configure
---

9aa9c8d3823d79755ddd1aa49b9af6198e24d4e2