Merge remote-tracking branch 'origin/master' into ticket
authorElena Mamontova <helenh463@gmail.com>
Fri, 21 Oct 2016 11:17:02 +0000 (14:17 +0300)
committerElena Mamontova <helenh463@gmail.com>
Fri, 21 Oct 2016 11:17:02 +0000 (14:17 +0300)
commitd1ddf1df6b8987cc1be7dc96608e22998c3e9cb6
tree5461fbb63ab4bdf32d86f794ed63d52d7b0b6f86
parent66c4165457f76e06ce6716a42dd4c8495af916db
parent0d5bff91a33dc190351adc0010f8218c81423799
Merge remote-tracking branch 'origin/master' into ticket