[SCM] emacs-jabber branch, master, updated. 823411b0a3785e1a29d5df2d60b6095a1320cd3b

[Evgenii T. <evg...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  823411b0a3785e1a29d5df2d60b6095a1320cd3b (commit)
      from  482a940b2681ae91af63c8ab6d25670d4dd07393 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 823411b0a3785e1a29d5df2d60b6095a1320cd3b
Author: Evgenii Terechkov <ev...@al...>
Date:   Thu Jan 9 23:01:25 2014 +0800

    We need jabber-bookmarks for jabber-muc-autojoin
    
    (via jabber-get-bookmarks and jabber-parse-conference-bookmark)

diff --git a/jabber-muc.el b/jabber-muc.el
index ceb8bc4..e55d04e 100644
--- a/jabber-muc.el
+++ b/jabber-muc.el
@@ -25,6 +25,10 @@
 (require 'jabber-disco)
 (require 'jabber-muc-nick-coloring)
 
+;; we need jabber-bookmarks for jabber-muc-autojoin (via
+;; jabber-get-bookmarks and jabber-parse-conference-bookmark):
+(require 'jabber-bookmarks)
+
 (require 'cl)
 
 ;;;###autoload

-----------------------------------------------------------------------

Summary of changes:
 jabber-muc.el |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
emacs-jabber