From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Thu, 9 Oct 2014 01:47:46 +0000 (+0800)
Subject: Merge commit '0b9eb2b647a49ffa3dc4e3e61cb8bd94c7fe3634' as 'packages/gnorb'
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/ab3b9137facc977cf39bb407cb1d7763b2e9a449

Merge commit '0b9eb2b647a49ffa3dc4e3e61cb8bd94c7fe3634' as 'packages/gnorb'
---

ab3b9137facc977cf39bb407cb1d7763b2e9a449
diff --cc packages/gnorb/.elpaignore
index 000000000,f614ef766..f614ef766
mode 000000,100644..100644
--- a/packages/gnorb/.elpaignore
+++ b/packages/gnorb/.elpaignore
diff --cc packages/gnorb/.gitignore
index 000000000,000000000..60fa2cac2
new file mode 100644
--- /dev/null
+++ b/packages/gnorb/.gitignore
@@@ -1,0 -1,0 +1,4 @@@
++*.elc
++notes.org
++gnorb-pkg.el
++gnorb-autoloads.el
diff --cc packages/gnorb/NEWS
index 000000000,728f21950..728f21950
mode 000000,100644..100644
--- a/packages/gnorb/NEWS
+++ b/packages/gnorb/NEWS
diff --cc packages/gnorb/README.org
index 000000000,cbb13afe9..cbb13afe9
mode 000000,100644..100644
--- a/packages/gnorb/README.org
+++ b/packages/gnorb/README.org
diff --cc packages/gnorb/dir
index 000000000,b0d0ad6e6..b0d0ad6e6
mode 000000,100644..100644
--- a/packages/gnorb/dir
+++ b/packages/gnorb/dir
diff --cc packages/gnorb/gnorb-bbdb.el
index 000000000,b30298f92..b30298f92
mode 000000,100644..100644
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
diff --cc packages/gnorb/gnorb-gnus.el
index 000000000,ba72107f9..ba72107f9
mode 000000,100644..100644
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
diff --cc packages/gnorb/gnorb-org.el
index 000000000,bc46eda7a..bc46eda7a
mode 000000,100644..100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
diff --cc packages/gnorb/gnorb-registry.el
index 000000000,0eee32ccd..0eee32ccd
mode 000000,100644..100644
--- a/packages/gnorb/gnorb-registry.el
+++ b/packages/gnorb/gnorb-registry.el
diff --cc packages/gnorb/gnorb-utils.el
index 000000000,68fe6b670..68fe6b670
mode 000000,100644..100644
--- a/packages/gnorb/gnorb-utils.el
+++ b/packages/gnorb/gnorb-utils.el
diff --cc packages/gnorb/gnorb.el
index 000000000,b702b7169..b702b7169
mode 000000,100644..100644
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/gnorb.el
diff --cc packages/gnorb/gnorb.info
index 000000000,64304bdce..64304bdce
mode 000000,100644..100644
--- a/packages/gnorb/gnorb.info
+++ b/packages/gnorb/gnorb.info
diff --cc packages/gnorb/gnorb.org
index 000000000,b03098b20..b03098b20
mode 000000,100644..100644
--- a/packages/gnorb/gnorb.org
+++ b/packages/gnorb/gnorb.org
diff --cc packages/gnorb/gnorb.texi
index 000000000,643552fbb..643552fbb
mode 000000,100644..100644
--- a/packages/gnorb/gnorb.texi
+++ b/packages/gnorb/gnorb.texi
diff --cc packages/gnorb/nngnorb.el
index 000000000,bdaf569bc..bdaf569bc
mode 000000,100644..100644
--- a/packages/gnorb/nngnorb.el
+++ b/packages/gnorb/nngnorb.el