Merge pull request #15 from madmax2012/merge_branch
authorDenis Ovsienko <denis@ovsienko.info>
Sun, 14 Dec 2014 04:30:08 +0000 (04:30 +0000)
committerDenis Ovsienko <denis@ovsienko.info>
Sun, 14 Dec 2014 04:30:08 +0000 (04:30 +0000)
commit45d335b739a04c7a0101ee37e922620416877da4
tree55d77fb4111bff921de6181bcb8e29002b83414f
parent1dd6f31e67cb2750edf6f855ca8ab35d7fdc6219
parentb79265f6ff04b3a98c9d22ff692b00bdb3de5349
Merge pull request #15 from madmax2012/merge_branch