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)

Trivial merge