Merge remote-tracking branch 'origin/1.8'
authorChristian Kamm <kamm@incasoftware.de>
Fri, 27 Mar 2015 10:19:59 +0000 (11:19 +0100)
committerChristian Kamm <kamm@incasoftware.de>
Fri, 27 Mar 2015 10:19:59 +0000 (11:19 +0100)
commitdfd9d8725c9388c79b8f97465672f83e10aae7dc
treea26737e98b334a576249a4ffeab3e832304d616d
parentd55d8c0152ff4cb9b11a107cccf06da2d67a7532
parent2578832002b7bb16e6bd370986d51b91e33e7f16
Merge remote-tracking branch 'origin/1.8'

Conflicts:
doc/installing.rst
src/gui/sharedialog.cpp