mozilla-b2g/gaia — pull request #21581 by mnjul (2014-07-10 11:09:44+00:00)
Title: Bug 1023500 - [VsD Refresh] Lockscreen Visual Refresh > Notifications not to spec

Conflicts:
apps/system/js/bootstrap.js
apps/system/js/lockscreen.js