keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147  -s ours am: af265461f1 am: 9d06c95c57
am: 292c2f7174

* commit '292c2f71744350048a9a1ddea96bb4e12b6a1d03':