[pkg-d-commits] [ldc] 54/95: Merge branch 'master' into merge-2.073

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.3.0-beta1
in repository ldc.

commit 2ffba599a2f151d3fe72a924da4748035663e925
Merge: 2aebbe4 f974722
Author: Martin <noone at nowhere.com>
Date:   Sat Mar 18 15:24:17 2017 +0100

    Merge branch 'master' into merge-2.073
    
    Conflicts:
    	runtime/druntime

 runtime/druntime | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc runtime/druntime
index 0f63356,f1b182b..7da56ea
--- a/runtime/druntime
+++ b/runtime/druntime
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0f6335695efe80b5de781949d1b6f9ce19b2c168
 -Subproject commit f1b182b71cd613dd3c1af88bfc7d79220c42511a
++Subproject commit 7da56eabfd88c34da821b8c2d160d616416a8d76

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git