Merge commit '1ce5a659e968af25122b46a3fc3b04b30b5ebdd5'

diff --combined packages/ahungry-theme/ahungry-theme.el
index d395fa2106b32a317492b90c14488ee8033bf83b,2356807edf8d0efcbbfc0490d1ed82c21c2e6d71..98deaf045db4a2494827f9039df40e46619fd700
--- 1/packages/ahungry-theme/ahungry-theme.el
--- 2/ahungry-theme.el
+++ b/packages/ahungry-theme/ahungry-theme.el
@@@ -1,11 -1,11 +1,11 @@@
 -;;; ahungry-theme.el --- Ahungry color theme for Emacs.  Make sure to (load-theme 'ahungry).
 +;;; ahungry-theme.el --- Ahungry color theme for Emacs.  Make sure to (load-theme 'ahungry).  -*- lexical-binding:t -*-
  
- ;; Copyright (C) 2015  Free Software Foundation, Inc.
+ ;; Copyright (C) 2015,2016  Free Software Foundation, Inc.
  
  ;; Author: Matthew Carter <m@ahungry.com>
  ;; Maintainer: Matthew Carter <m@ahungry.com>
  ;; URL: https://github.com/ahungry/color-theme-ahungry
- ;; Version: 1.0.12
+ ;; Version: 1.1.0
  ;; Keywords: ahungry palette color theme emacs color-theme deftheme
  ;; Package-Requires: ((emacs "24"))
  
@@@ -36,6 -36,9 +36,9 @@@
  
  ;;; News:
  
+ ;;;; Changes since 1.0.12:
+ ;; - Add erc/jabber faces to begin with
+ 
  ;;;; Changes since 1.0.11:
  ;; - Purple is too hard to read on poor contrast monitors, use a blue
  
@@@ -229,6 -232,14 +232,14 @@@
     '(helm-selection ((t (:foreground "#ff0099" :italic t :bold t :background "#f2e997"))))
     '(helm-match ((t (:foreground "gold1"))))
     '(helm-visible-mark ((t (:background "#f2e997" :foreground "#ff0099" :bold nil :italic nil))))
+    '(erc-nick-default-face ((t (:foreground "#ff0099"))))
+    '(erc-current-nick-face ((t (:foreground "#0099ff"))))
+    '(erc-input-face ((t (:foreground "#0099ff"))))
+    '(erc-prompt-face ((t (:background nil :foreground "#666666" :bold t :italic t))))
+    '(erc-timestamp-face ((t (:background nil :foreground "#666666" :bold nil :italic t))))
+    '(jabber-chat-prompt-foreign ((t (:foreground "#ff0099"))))
+    '(jabber-chat-prompt-local ((t (:foreground "#0099ff"))))
+    '(jabber-rare-time-face ((t (:foreground "#666666" :bold nil :italic t))))
     )
    (custom-theme-set-variables
     'ahungry