[elpa] master c66cf42: Merge commit '96b73f42807bc34c11e9bb99f25b856b249014b5'

[Eric Abrahamsen]

branch: master
commit c66cf426234aee31677a6f878f34eda3f626a947
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Merge commit '96b73f42807bc34c11e9bb99f25b856b249014b5'
    
    Merge further fixes to last update
---
 packages/gnorb/gnorb-bbdb.el | 2 +-
 packages/gnorb/gnorb-org.el  | 5 ++++-
 packages/gnorb/gnorb.el      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/gnorb/gnorb-bbdb.el b/packages/gnorb/gnorb-bbdb.el
index 6ce7c5c..d391e3a 100644
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@ -107,7 +107,7 @@ mentioned in the docstring of `format-time-string', which 
see."
   :group 'gnorb-bbdb
   :type 'string)
 
-(defface gnorb-bbdb-link 'org-link
+(defface gnorb-bbdb-link '((t :inherit org-link))
   "Custom face for displaying message links in the *BBDB* buffer.
   Defaults to org-link."
   :group 'gnorb-bbdb)
diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index bd787db..9335cf6 100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -86,7 +86,10 @@ list of three elements: a character key, a string tag and a
 symbol indicating a custom function.  The custom function will be
 called on the heading in question, and passed a plist containing
 information about the message from which we're triggering."
-:group 'gnorb-org :type 'list :version "1.1.3")
+
+  :group 'gnorb-org
+  :type 'list
+  :package-version '(gnorb . "1.1.3"))
 
 (defcustom gnorb-org-msg-id-key "GNORB_MSG_ID"
   "The name of the org property used to store the Message-IDs
diff --git a/packages/gnorb/gnorb.el b/packages/gnorb/gnorb.el
index 3311e4a..5763f00 100644
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2014  Free Software Foundation, Inc.
 
-;; Version: 1.1.3
+;; Version: 1.1.4
 ;; Package-Requires: ((cl-lib "0.5"))
 
 ;; Maintainer: Eric Abrahamsen <address@hidden>