Merge branch 'presentation'

diff --git a/main.tex b/main.tex
index ba238a6..fd48513 100644 (file)
--- a/main.tex
+++ b/main.tex
@@ -1,7 +1,7 @@
 \documentclass[a4paper,11pt]{article}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
-\usepackage{ae}
+\usepackage{lmodern}
 \usepackage{color}
 \usepackage{graphicx}
 \usepackage{wrapfig}
@@ -30,7 +30,8 @@
 \title{Chatty Things -- Making the Internet of Things Readily Usable for the
 Masses with XMPP}
 \author{Roland Hieber}
-\date{Seminar Communications and Multimedia, TU~Braunschweig \\[1em] \today}
+\date{Seminar Communications and Multimedia, TU~Braunschweig \\[1em]
+  January 27, 2014}
 
 \begin{document}
 \maketitle