Merge release 1.6.1

James Moger

2014-10-20 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c

 src/main/java/com/gitblit/tickets/TicketNotifier.java

@@ -596,7 +596,7 @@

      // respect the author's email preference
      UserModel lastAuthor = userManager.getUserModel(lastChange.author);
      if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
      if (lastAuthor != null && !lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
         toAddresses.remove(lastAuthor.emailAddress);
         ccAddresses.remove(lastAuthor.emailAddress);
      }