tree cdd2d49485e647590da03c89db88138034a7197f
parent c6757ea7fb1b7b05cf490df441fd1916dc0f4dce
parent 383a1051b8aee573ca7f792204be983da10087f8
author Jakub Pavlik <pavlk.jakub@gmail.com> 1425335685 +0100
committer Jakub Pavlik <pavlk.jakub@gmail.com> 1425335685 +0100

Merge branch 'INT-101' into 'develop'

Int 101

See merge request !2