[gradle-1.12] 193/211: Merge tag 'upstream/1.12'

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository gradle-1.12.

commit 991f17d34e1bf2e2c4b7fa906a5a8fd43f4b60ef
Merge: 00a00b0 42462b9
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sat Jun 20 23:35:17 2015 +0800

    Merge tag 'upstream/1.12'
    
    Upstream version 1.12

 .../org/gradle/api/internal/file/archive/nomodeinfos.zip  | Bin 0 -> 276 bytes
 .../org/gradle/api/internal/file/archive/permissions.zip  | Bin 0 -> 300 bytes
 .../diagnostics/htmldependencyreport/jquery-1.10.1.min.js |   6 ------
 .../maven/pomGeneration/lib/providedRuntime-1.0.zip       | Bin 0 -> 144 bytes
 .../src/samples/userguide/files/copy/src/main/assets.zip  | Bin 0 -> 332 bytes
 5 files changed, 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git