cleanup and conflict fix
authorjeroendedauw <jeroendedauw@gmail.com>
Wed, 11 Apr 2012 10:49:43 +0000 (12:49 +0200)
committerjeroendedauw <jeroendedauw@gmail.com>
Wed, 11 Apr 2012 10:49:43 +0000 (12:49 +0200)
commit02fc755d1c69c12fe0b2897801c1b377d768acd7
treee86c6197c793781140677551c630c018be42d003
parent9ae0b30383852be157c592f6bdf02b08bd49cf95
cleanup and conflict fix

Change-Id: If65cb2393f4765b4f2c3e04f451beba59dea6d97
includes/Article.php
includes/ContentHandler.php