Merge remote-tracking branch 'origin/amorale/OP-1683_syncupdate_oneshot' into next
commit46521f1c2d99fc9f2b6f24323881e2e95a900aff
authorAlessio Morale <alessiomorale@gmail.com>
Sun, 8 Feb 2015 16:59:59 +0000 (8 17:59 +0100)
committerAlessio Morale <alessiomorale@gmail.com>
Sun, 8 Feb 2015 16:59:59 +0000 (8 17:59 +0100)
tree230a460a1df0301affe325ab0cb2f562a06b5180
parent240abe4bab23dc980185c5b2cdd3e0db9322e57d
parent09319c38056c685a07ac5ed6def139e1dba47c8b
Merge remote-tracking branch 'origin/amorale/OP-1683_syncupdate_oneshot' into next