Merge pull request #3114 from owncloud/update-notification

author Raghu Nayyar <me@iraghu.com>

Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)

committer Raghu Nayyar <me@iraghu.com>

Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)
author Raghu Nayyar <me@iraghu.com>
Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)
committer Raghu Nayyar <me@iraghu.com>
Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)
diff --cc core/css/styles.css
Simple merge
diff --cc lib/templatelayout.php
Simple merge
author	Raghu Nayyar <me@iraghu.com>
	Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)
committer	Raghu Nayyar <me@iraghu.com>
	Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
lib/templatelayout.php	patch \|	diff1 \|	diff2 \|	blob \| history