[sisu-guice] 01/01: Merge tag 'upstream/3.1.9+dfsg'

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository sisu-guice.

commit 11e3a19ffb9c6efb4267723755a8f99964e56d5e
Merge: 50ed7a6 5c5a859
Author: tony mancill <tmancill at debian.org>
Date:   Thu Feb 6 20:36:26 2014 -0800

    Merge tag 'upstream/3.1.9+dfsg'
    
    Upstream version 3.1.9+dfsg
    
    Conflicts:
    	.gitignore

 .gitignore                                                  |  11 +++++++++--
 .../src/com/google/inject/assistedinject/Assisted.java      |   0
 .../google/inject/assistedinject/AssistedConstructor.java   |   0
 .../com/google/inject/assistedinject/AssistedInject.java    |   0
 .../com/google/inject/assistedinject/FactoryProvider.java   |   0
 .../src/com/google/inject/assistedinject/Parameter.java     |   0
 .../com/google/inject/assistedinject/ParameterListKey.java  |   0
 .../google/inject/assistedinject/FactoryProviderTest.java   |   0
 .../persist/src/com/google/inject/persist/UnitOfWork.java   |   0
 .../com/google/inject/servlet/DefaultFilterPipeline.java    |   0
 .../com/google/inject/servlet/FilterChainInvocation.java    |   0
 .../src/com/google/inject/servlet/FilterDefinition.java     |   0
 .../src/com/google/inject/servlet/FilterPipeline.java       |   0
 .../src/com/google/inject/servlet/FiltersModuleBuilder.java |   0
 .../com/google/inject/servlet/ManagedFilterPipeline.java    |   0
 .../com/google/inject/servlet/ManagedServletPipeline.java   |   0
 .../src/com/google/inject/servlet/ServletDefinition.java    |   0
 .../com/google/inject/servlet/ServletsModuleBuilder.java    |   0
 .../src/com/google/inject/servlet/UriPatternMatcher.java    |   0
 .../src/com/google/inject/servlet/UriPatternType.java       |   0
 lib/build/guice-3.0.xml                                     |   0
 lib/build/jdiff/Null.java                                   |   0
 lib/build/jdiff/background.gif                              | Bin
 lib/build/jdiff/black.gif                                   | Bin
 lib/build/jdiff/new.gif                                     | Bin
 uploadApiDiffs.sh                                           |   0
 26 files changed, 9 insertions(+), 2 deletions(-)

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