Merge branch 'master'
commit4234261373c87da3546a93bd4148cd0f49d58df5
authoranomen <ludek.h@gmail.com>
Sat, 23 May 2015 09:25:14 +0000 (23 11:25 +0200)
committeranomen <ludek.h@gmail.com>
Sat, 23 May 2015 09:25:14 +0000 (23 11:25 +0200)
treec2a71b9e5236a31386f069e961c8e85f33d67fe8
parent1ae64f0c1b99ff1b8c845c129b188b026438746b
parent5c4746b271d528b7bce204c039334f56ae9852a6
Merge branch 'master'