aboutsummaryrefslogtreecommitdiffstats
path: root/preamble/preamble.tex
diff options
context:
space:
mode:
authorGustav Eek <gustav@fripost.org>2015-03-02 20:28:05 +0100
committerGustav Eek <gustav@fripost.org>2015-03-02 20:28:05 +0100
commit8c9f57713b34a6a1e9e8a2c67aa17c43e644ad2e (patch)
tree44a638f050c69b61b5c5d536664a72e4bc5e64a6 /preamble/preamble.tex
parentfe12842374a257c03c7210ae9fddfdafe5cb79d7 (diff)
parent4b3b4a69975aa2c8fb50173b76b0c7797e4ca5fb (diff)
Merge branch 'may-19', containing minutes from May 19 and June 16
Conflict for '2014/Makefile' was solved
Diffstat (limited to 'preamble/preamble.tex')
-rw-r--r--preamble/preamble.tex2
1 files changed, 2 insertions, 0 deletions
diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 55c4baa..ed52144 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -100,6 +100,8 @@
\newcommand \otrss {\otrs\ (Open-source Ticket Request System)}
\newcommand \paypal {PayPal}
\newcommand \pgp {\textsc{pgp}}
+\newcommand \prq {\textsc{prq}}
+\newcommand \prqq {PeriQ Networks (\textsc{prq})}
\newcommand \raid {\textsc{raid}}
\newcommand \rfc {\textsc{rfc}}
\newcommand \serengeti {\texthost{serengeti}}