Merge branch 'master' into next

Conflicts:
	debian/changelog
This commit is contained in:
Michael Stapelberg
2012-01-27 19:34:15 +00:00
3 changed files with 58 additions and 3 deletions

View File

@ -7,7 +7,7 @@ template::[header-declarations]
<refentrytitle>{mantitle}</refentrytitle>
<manvolnum>{manvolnum}</manvolnum>
<refmiscinfo class="source">i3</refmiscinfo>
<refmiscinfo class="version">4.1.1</refmiscinfo>
<refmiscinfo class="version">4.1.2</refmiscinfo>
<refmiscinfo class="manual">i3 Manual</refmiscinfo>
</refmeta>
<refnamediv>