Merge branch 'master'
commitc39f1914f8971174dfa0d88e69f999734356c88d
authoranomen <ludek.h@gmail.com>
Wed, 9 Apr 2014 07:39:23 +0000 (9 09:39 +0200)
committeranomen <ludek.h@gmail.com>
Wed, 9 Apr 2014 07:39:23 +0000 (9 09:39 +0200)
tree080015a5fb92428c5a8279a7d5725625c7a7238d
parent94a86fabfc56346dd98545013b7531b525a80eba
parent9b910d2f881fb907bd7d730aa635c9f35263b8c8
Merge branch 'master'