Merge branch 'master' into vk/mergge
commitea9000ff7616189ed072dd00cac7a90a84f0db91
authorJan Mandel <Jan.Mandel@gmail.com>
Sat, 20 Jul 2013 04:41:20 +0000 (19 22:41 -0600)
committerJan Mandel <Jan.Mandel@gmail.com>
Sat, 20 Jul 2013 04:41:20 +0000 (19 22:41 -0600)
tree2e1b231bf28a249edbf4c0266efece55b2ed9eac
parent5cb6b3d2c1ff7dba0afc138c2708f6a901efbf88
parenteaaea12d0cfc1440443c698d8ab655038f98d85e
Merge branch 'master' into vk/mergge