summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-01 13:52:26 +0000
committerintrigeri <intrigeri@boum.org>2016-12-01 13:52:26 +0000
commit19e07553227ce358d5a145410c1fbeebe997fd92 (patch)
tree5f2d299d8faf90edc79101f325b51739bcd0d4bc
parent4621c3b6ff749457dcc71d85b794407fe43a6ec2 (diff)
parent3e00e7b346e281f2720f497eecef6da8492d21be (diff)
parent6e0d777a79f2440fc27ab8f3566851cbaf7520e6 (diff)
Merge remote-tracking branches 'origin/test/11991-sikulix-support' and 'origin/test/11911-11960-11906-fixes' into stable
Fix-committed: #11991 Fix-committed: #11911 Fix-committed: #11960 Fix-committed: #11906