mozilla-b2g/gaia — pull request #18162 by mikehenrty (2014-04-10 10:56:22+00:00)
Title: Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps

Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notif...
Conflicts:
apps/calendar/js/notification.js
apps/calendar/test/marionette/alarm_test.js