Commit Graph

188576 Commits

Author SHA1 Message Date
B2G Bumper Bot
f693be0361 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/30aac878cf3d
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #20574 from Rik/suggestion-slot-2-1022194

Bug 1022194 - Taping the suggestion bar with only one SIM in slot 2 does... r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/790793c13fce
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 1022194 - Taping the suggestion bar with only one SIM in slot 2 doesn't work
2014-06-16 10:31:25 -07:00
B2G Bumper Bot
9168523255 Bumping manifests a=b2g-bump 2014-06-16 10:21:40 -07:00
B2G Bumper Bot
2d1ca10814 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/be50e334ab5b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20563 from crdlc/bug-1025855

Bug 1025855 - [Vertical Homescreen] Wrong box shadow for bookmarks in edit mode

========

https://hg.mozilla.org/integration/gaia-central/rev/d9a842241d74
Author: crdlc <crdlc@tid.es>
Desc: Bug 1025855 - [Vertical Homescreen] Wrong box shadow for bookmarks in edit mode
2014-06-16 10:16:31 -07:00
B2G Bumper Bot
bdae60be84 Bumping manifests a=b2g-bump 2014-06-16 09:31:27 -07:00
B2G Bumper Bot
e66637a43b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1980e95de84b
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #20564 from EverythingMe/1025844-stored-bg

Bug 1025844 - [Collections] Missing Default Icon and faster Background load

========

https://hg.mozilla.org/integration/gaia-central/rev/b88060078127
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 1025844 - [Collections] Missing Default Icon and faster Background load
2014-06-16 09:21:47 -07:00
B2G Bumper Bot
e15cb595ec Bumping manifests a=b2g-bump 2014-06-16 09:11:36 -07:00
B2G Bumper Bot
ec62fcb4e1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/13f9b7c70028
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #20570 from viorelaioia/bug_1025908

Bug 1025908 - [Flame] Update locator in FTU geolocation checkbox

========

https://hg.mozilla.org/integration/gaia-central/rev/49768334f88e
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1025908 - [Flame] Update locator in FTU geolocation checkbox
2014-06-16 09:06:36 -07:00
B2G Bumper Bot
b139a68c6c Bumping manifests a=b2g-bump 2014-06-16 08:49:19 -07:00
B2G Bumper Bot
8b8937af21 Bumping gaia.json for 12 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d74c3255ba2c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20544 from KevinGrandon/bug_1025609_calendar_uuid_path_fix

Bug 1025609 - Unable to add a Gmail calendar

========

https://hg.mozilla.org/integration/gaia-central/rev/ef81b615d4ee
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1025609 - Unable to add a Gmail calendar f=gerard-majax r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/e7e1282b05fc
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #20500 from wilsonpage/1025053

Bug 1025053 - [Camera] Fix odd classes being added to controls

========

https://hg.mozilla.org/integration/gaia-central/rev/20ee5d05214b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1025053 - [Camera] Fix odd classes being added to controls

========

https://hg.mozilla.org/integration/gaia-central/rev/0b864fcbafe1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #20243 from gabrielesvelto/bug-1022554-do-not-launch-before-populating-the-message

Bug 1022450 - Don't show the "WAP Push Message" string in the header when opening a message
r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/fe544041ff82
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1022450 - Don't show the "WAP Push Message" string in the header when opening a message

========

https://hg.mozilla.org/integration/gaia-central/rev/21d94993a148
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20275 from lanker-sony/1022733-splash_icon

Bug 1022733 - Entry points lost their splash screen/overlay icons

========

https://hg.mozilla.org/integration/gaia-central/rev/41dd86ccfc95
Author: Fredrik Lanker <fredrik.lanker@sonymobile.com>
Desc: Bug 1022733 - Entry points lost their splash screen/overlay icons

The origin for applications that have different entry points (e.g.,
Dialer and Contacts are the same application, Communications) also
contains a pathname, so we need to remove that from the origin before
appending the splash icon path.

========

https://hg.mozilla.org/integration/gaia-central/rev/744cddb3d34b
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #20379 from yzen/bug-1023996

Bug 1023996 - adding missing aria attributes to e.me controls.

========

https://hg.mozilla.org/integration/gaia-central/rev/970adaaeb5bc
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1023996 - adding missing aria attributes to e.me controls.

========

https://hg.mozilla.org/integration/gaia-central/rev/c2769f7b9587
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #20377 from yzen/bug-1023989

Bug 1023989 - fixed roles and labels for e.me's collection/search result...

========

https://hg.mozilla.org/integration/gaia-central/rev/f2cca7dc7bd4
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1023989 - fixed roles and labels for e.me's collection/search results view.
2014-06-16 08:46:31 -07:00
B2G Bumper Bot
63107ba531 Bumping manifests a=b2g-bump 2014-06-16 05:01:26 -07:00
B2G Bumper Bot
5a76842e5f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/99d5a7c6f3b1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #20423 from jmcanterafonseca/multi_contacts

Bug 989927 - [Contacts][Refactor] Create a library that reads the Global...

========

https://hg.mozilla.org/integration/gaia-central/rev/8850fdfd9215
Author: José Manuel Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 989927 - [Contacts][Refactor] Create a library that reads the Global Contacts DataStore and provide a single contact
2014-06-16 04:56:46 -07:00
Ben Tian
d760772c79 Bug 1016186 - Wrap nsRefPtr<BluetoothAdapter> instead of BluetoothAdapter*, r=echou 2014-06-05 14:52:45 +08:00
Ben Tian
b344f6d176 Bug 1016186 - Do not fire AdapterAdded event when BT is turned on, r=echou 2014-06-04 16:11:59 +08:00
B2G Bumper Bot
316ead2e17 Bumping manifests a=b2g-bump 2014-06-16 03:23:29 -07:00
B2G Bumper Bot
534a1d055d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5c60ea756ecf
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #20503 from arcturus/bug-1023911

Bug 1023911 - [Contacts] Investigate why integration test contacts_shortcuts_test.js is failing r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/afe2b8bd82b3
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1023911 - [Contacts] Investigate why integration test contacts_shortcuts_test.js is failing

========

https://hg.mozilla.org/integration/gaia-central/rev/a72969ba1f53
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #19989 from comoyo/bug-1020109

Bug 1020109 - Cell broadcast search list is not set correctly. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/5e3f81eff8ae
Author: Kevin Simons <kevin@comoyo.com>
Desc: Bug 1020109 - Cell broadcast search list is not set correctly

The current code attempts to protect against empty objects incorrectly
since empty arrays are truthy in JavaScript. The result is empty objects
get passed to SettingsLock.set() which seems to break all subsequent
settings change observers.
2014-06-16 03:21:02 -07:00
B2G Bumper Bot
4e910e8134 Bumping manifests a=b2g-bump 2014-06-16 01:58:40 -07:00
B2G Bumper Bot
081bccd892 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0c2d8b2b6604
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #20535 from EverythingMe/1025632-conntype

Bug 1025632 - [EverythingMe] Context: Connection type, MCC, MNC

========

https://hg.mozilla.org/integration/gaia-central/rev/fae970cfd241
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 1025632 - [EverythingMe] Context: Connection type, MCC, MNC
2014-06-16 01:58:30 -07:00
Jan Keromnes
78b25a6311 Bug 976024 - Track Unique Set Size in the Developer HUD. r=21, r=njn 2014-06-13 06:38:00 +02:00
Solomon Chiu
7eef5bc932 Bug 973777 - Breaking down the information of GrallocReporter. r=njn 2014-06-15 23:27:00 +08:00
Jamin Liu
aea82587a6 Bug 1009157 - Ensures that we can receive BT enable/disabled events in marionette test every times. r=echou
Ensures that we can always receive that "enabled"/"disabled" event by
installing the event handler *before* we ever enable/disable Bluetooth. Or
we might just miss those events and get a timeout error.
2014-06-15 22:50:00 +02:00
B2G Bumper Bot
289e42853f Bumping manifests a=b2g-bump 2014-06-16 01:16:42 -07:00
B2G Bumper Bot
c1c0922d50 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/505dfe87a4a5
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #20541 from cctuan/973443-2

Bug 973443 - [settings] refactor Display panel with AMD pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/5762c343ea1a
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 973443 - [settings] refactor Display panel with AMD pattern
2014-06-16 01:11:28 -07:00
B2G Bumper Bot
c9b0d8f52d Bumping manifests a=b2g-bump 2014-06-16 00:21:19 -07:00
B2G Bumper Bot
88eac23fb7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/584e33a45f6b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20536 from KevinGrandon/bug_1022414_dragdrop_fixes

Bug 1022414 - [Vertical] Dragdrop improvements

========

https://hg.mozilla.org/integration/gaia-central/rev/764670b6ec93
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1022414 - [Vertical] Dragdrop improvements r=crdlc

Many improvements to drag drop in vertical homescreen including:
* Ignores dividers during distance calculation and relys only on icons or placeholders to determine proper drop target.
* Render a row of placeholders after the last divider. This ensures we have a valid drop target even if we ignore dividers.
* The last row of placeholders have a smaller size are are only for divider creation.
* Buffers from/to indexes to have slightly better performance and prevent the stuck icon situation.

========

https://hg.mozilla.org/integration/gaia-central/rev/7777da9ed5b2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20522 from KevinGrandon/bug_1021343_dual_homescreen_entries

Bug 1021343 - [Settings] Duplicated Homescreen entry

========

https://hg.mozilla.org/integration/gaia-central/rev/958aeef31aff
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021343 - [Settings] Duplicated Homescreen entry r=crdlc r=yurenju
2014-06-16 00:11:43 -07:00
B2G Bumper Bot
d09eef3a90 Bumping manifests a=b2g-bump 2014-06-15 23:21:31 -07:00
B2G Bumper Bot
2322020245 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8a5b2c90d4b1
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #20466 from gasolin/issue-1024828

Bug 1024828 - [permission] there's a blank line between permission dialo..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/92369bac4598
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1024828 - [permission] there's a blank line between permission dialog and soft button

========

https://hg.mozilla.org/integration/gaia-central/rev/b11a5fc3375a
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #20467 from gasolin/issue-1022908

Bug 1022908 - [B2G][Flame][Browser] Camera and microphone permissions ar..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/4d894ecbeaf4
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1022908 - [B2G][Flame][Browser] Camera and microphone permissions are truncated

========

https://hg.mozilla.org/integration/gaia-central/rev/4cda5c99bbfc
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #20006 from pivanov/bug-1020010

Bug 1020010 - [flame][gallery] [video] fuzzy icons

========

https://hg.mozilla.org/integration/gaia-central/rev/8dea7c1938d8
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1020010 - [flame][gallery] [video] fuzzy icons
2014-06-15 23:16:57 -07:00
B2G Bumper Bot
687d255c50 Bumping manifests a=b2g-bump 2014-06-15 23:06:30 -07:00
B2G Bumper Bot
7516a5ebf1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2571d5dffca8
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #20213 from mnjul/bug_1021860_lockscreen_icon_wrong_color

Bug 1021860 - [VsD Refresh] Lockscreen Visual Refresh > Lockscreen icons are not the right color  [r=gweng]

========

https://hg.mozilla.org/integration/gaia-central/rev/7c13fbdf52a0
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1021860 - [VsD Refresh] Lockscreen Visual Refresh > Lockscreen icons are not the right color

========

https://hg.mozilla.org/integration/gaia-central/rev/1d1603dd2d12
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #20211 from mnjul/bug_1021391_lockscr_unlock_icon_too_low

Bug 1021391 - [VsD Refresh] Lockscreen Visual Refresh > Unlock icon too low [r=gweng]

========

https://hg.mozilla.org/integration/gaia-central/rev/288ce7246a33
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1021391 - [VsD Refresh] Lockscreen Visual Refresh > Unlock icon too low
2014-06-15 23:01:55 -07:00
Ben Tian
253e55090e Bug 1025732 - [bluetooth2][RIL] Add number and name presentation, r=shuang 2014-06-16 11:53:56 +08:00
B2G Bumper Bot
f172e29ae5 Bumping manifests a=b2g-bump 2014-06-15 22:26:23 -07:00
B2G Bumper Bot
36fc17d9bf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0de916089869
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #20420 from mnjul/bug_1023642_lockscreen_classlist_undefined

Bug 1023642 - Javascript Error: window.lockScreen.classList is undefined [r=gweng]

========

https://hg.mozilla.org/integration/gaia-central/rev/b2241d308cc5
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1023642 - Javascript Error: window.lockScreen.classList is undefined
2014-06-15 22:21:51 -07:00
B2G Bumper Bot
e8d8f9ae2c Bumping manifests a=b2g-bump 2014-06-15 22:01:24 -07:00
B2G Bumper Bot
07b5281a52 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1719728ee297
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #20396 from steveck-chung/bug-994553

Bug 994553 - [Sora][Message][Contacts]Contacts's head portrait do not display in Message. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/344b84c20310
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 994553 - [Sora][Message][Contacts]Contacts's head portrait do not display in Message
2014-06-15 21:56:48 -07:00
B2G Bumper Bot
09ece1323c Bumping manifests a=b2g-bump 2014-06-15 21:31:29 -07:00
B2G Bumper Bot
9f620fe4ce Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/03c58acaff53
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1022971 - Rename follow-up for merge conflicts r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/91f633348637
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #19732 from fcampo/sms-confirm-button-1005866

Bug 1005866 - Confirmation button on delete is wrong. r=steveck-chung

========

https://hg.mozilla.org/integration/gaia-central/rev/1fce39dd0dd5
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Bug 1005866 - Confirmation button on delete is wrong
2014-06-15 21:26:23 -07:00
B2G Bumper Bot
43313e584a Bumping manifests a=b2g-bump 2014-06-15 21:16:24 -07:00
B2G Bumper Bot
89df59bb97 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1560239ea718
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20476 from KevinGrandon/bug_1024874_system_uuid

Bug 1024874 - [System] Use shared uuid.js

========

https://hg.mozilla.org/integration/gaia-central/rev/125b019fa079
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1024874 - [System] Use shared uuid.js r=timdream
2014-06-15 21:11:47 -07:00
B2G Bumper Bot
5a2f9dbd73 Bumping manifests a=b2g-bump 2014-06-15 20:06:13 -07:00
B2G Bumper Bot
5db85555fe Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6a21440c4b11
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #20417 from steveck-chung/bug-1021788

Bug 1021788 - [Messages] Can't click on the suggestion list when there are a lot of recipients in the recipients panel. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/78a211078c39
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1021788 - [Messages] Can't click on the suggestion list when there are a lot of recipients in the recipients panel
2014-06-15 20:01:40 -07:00
B2G Bumper Bot
bb1042e9bc Bumping manifests a=b2g-bump 2014-06-15 19:49:10 -07:00
B2G Bumper Bot
678abd19bb Bumping manifests a=b2g-bump 2014-06-15 11:21:14 -07:00
B2G Bumper Bot
db23672765 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1b846519bdcc
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #20486 from pivanov/bug-1021380

Bug 1021380 - [flame][contacts] icons when contact list is empty seem fuzzy

========

https://hg.mozilla.org/integration/gaia-central/rev/6f82d3e06b94
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1021380 - [flame][contacts] icons when contact list is empty seem fuzzy

========

https://hg.mozilla.org/integration/gaia-central/rev/59cc5bce8bba
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #20271 from pivanov/bug-1023117

Bug 1023117

========

https://hg.mozilla.org/integration/gaia-central/rev/88f2a69b91c4
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1023117 - [Flame][Camera]Missing images for Camera
2014-06-15 11:16:33 -07:00
Phil Ringnalda
ebbeebd17b Merge b-i to m-c, a=merge 2014-06-15 09:45:59 -07:00
Phil Ringnalda
ec05aabb4e Merge f-t to m-c, a=merge 2014-06-15 09:36:23 -07:00
Phil Ringnalda
4e06fa48fe Merge m-i to m-c, a=merge 2014-06-15 09:28:20 -07:00
B2G Bumper Bot
88939b4aca Bumping manifests a=b2g-bump 2014-06-15 04:41:13 -07:00
B2G Bumper Bot
3bebe974b1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/39d06bda5d40
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #20531 from mcjimenez/bug1024623

Bug 1024623 - [Vertical] Add collections to customization of vertical homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/4fc040a41e9f
Author: Carmen Jimenez Cabezas <cjc@tid.es>
Desc: Bug 1024623 - [Vertical] Add collections to customization of vertical homescreen
2014-06-15 04:36:30 -07:00
Ehsan Akhgari
91d3eae2f3 Bug 1024459 - Define an out of line destructor for TextTrack so that we can forward delcare HTMLTrackElement in TextTrack.h; r=bzbarsky
This is required because the destructor for the nsRefPtr<HTMLTrackElement>
member requires the full definition of the type.
2014-06-14 22:53:52 -04:00
Phil Ringnalda
09bbd3df0c Back out 53e5f619cb62 (bug 1025497) for build bustage
CLOSED TREE
2014-06-14 19:04:52 -07:00
B2G Bumper Bot
69ea857675 Bumping manifests a=b2g-bump 2014-06-14 17:31:29 -07:00