Merge branch 'master' into settings
authorMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:23:01 +0000 (15:23 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:23:01 +0000 (15:23 +0200)
commitb4da66ad9d2f0a5182b173c1d81e8c6e36925c08
tree0fcc282aeebfecfc1a805e6035de7c0a671c8a6f
parent51ab5af594df419a022f3bda0ed7b24532149c47
parent16253d1930ddc49fc672062ceb2c26789125fb82
Merge branch 'master' into settings