Merge branch 'ticket91'
authoradam <adamansky@gmail.com>
Mon, 19 Aug 2013 18:42:12 +0000 (01:42 +0700)
committeradam <adamansky@gmail.com>
Mon, 19 Aug 2013 18:42:12 +0000 (01:42 +0700)
commit853c696b6077db432a68b86ad08ce1483042e5af
tree37dba5463148a1410313c79c417a9fb8f7544aa8
parentbe7597f02a0570db86f3d393070db7eeed626111
parentae51ac621b1e6342c2223a006a7b1d83e2e690a2
Merge branch 'ticket91'