Merge branch 'master' into develop
authorDaniel Kochmański <dkochmanski@gmail.com>
Sat, 21 Feb 2015 18:52:01 +0000 (19:52 +0100)
committerDaniel Kochmański <dkochmanski@gmail.com>
Sat, 21 Feb 2015 18:52:01 +0000 (19:52 +0100)
commit25a4892635b72b50682d04a8acd3ed8a42693b67
treeab6879546b76103df3cd8ce8fa386aa91ab4e10d
parentef741d41090daae389fca691ac5a5b1a3e3ed45e
parent8a2d0c96e8d53187ef8c6d28c49972d197f8d651
Merge branch 'master' into develop