Merge branches 'buttons', 'numeric' and 'pdflatex'
authorJoey Schulze <joey@infodrom.org>
Sun, 22 Dec 2013 12:04:15 +0000 (13:04 +0100)
committerJoey Schulze <joey@infodrom.org>
Sun, 22 Dec 2013 12:04:15 +0000 (13:04 +0100)
1  2  3 
artikel.php

diff --cc artikel.php
Simple merge