Merge pull request #5528 from frisco82/changeUpadateNotification

author Thomas Müller <thomas.mueller@tmit.eu>

Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)

committer Thomas Müller <thomas.mueller@tmit.eu>

Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)
diff --cc core/css/styles.css
Simple merge
diff --cc lib/base.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 24 Oct 2013 17:28:17 +0000 (10:28 -0700)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
lib/base.php	patch \|	diff1 \|	diff2 \|	blob \| history