Merge non-fast-forward for release branch merges

James Moger

2014-06-16 9186c6413e7cdfc33527ca69d2e56dfec6d8b760

 src/main/java/com/gitblit/transport/ssh/WelcomeShell.java

@@ -1,4 +1,5 @@
/*
 * Copyright (C) 2009 The Android Open Source Project
 * Copyright 2014 gitblit.com.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");