Merge remote-tracking branch 'gear/sisyphus'
commit368d379dd4a62a845b529624f30683bf8291eaf1
authorVitaly Lipatov <lav@etersoft.ru>
Wed, 17 Dec 2014 11:35:46 +0000 (17 14:35 +0300)
committerVitaly Lipatov <lav@etersoft.ru>
Wed, 17 Dec 2014 11:35:46 +0000 (17 14:35 +0300)
tree43d0c49a14c44284c92dc6e74e8f7fc89684e96d
parent82e12b2eeab39a61f0f59018f5123d0031693112
parent6907e6673704278a76d73e27d8be8fdc1ac2c1d6
Merge remote-tracking branch 'gear/sisyphus'