From: Michael Wallner Date: Thu, 5 Dec 2013 08:37:03 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' X-Git-Tag: release-1.0.2RC1~20 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9155673850189951e27e188f2003ba68d8ea2c67;p=m6w6%2Fext-propro Merge remote-tracking branch 'refs/remotes/origin/master' especially if it merges an updated upstream into a topic branch. --- 9155673850189951e27e188f2003ba68d8ea2c67