Merge branch 'master'
commit7b887c0a6c512d94433b5f21c5852f2aa5235327
authoranomen <ludek.h@gmail.com>
Fri, 25 Apr 2014 21:49:15 +0000 (25 23:49 +0200)
committeranomen <ludek.h@gmail.com>
Fri, 25 Apr 2014 21:49:15 +0000 (25 23:49 +0200)
treeba287779997b6e1d8d194d444b941cf35af2a4c9
parent4a203b8428f506632129ddae75efa14988781f41
parent58a9eafae6fa8454fae3486538e9569d2ba0b987
Merge branch 'master'