commit 1.2
Squashed commit of the following:

commit 6972a73c24c54d3416cddb01812655768fa5d146
Author: Tomasz Jokiel <tomasz.jokiel@gmail.com>
Date:   Mon Jan 14 20:41:09 2013 +0100

    commit 2

commit 0f540879fb4281e498bb9c61245283b159a90181
Author: Tomasz Jokiel <tomasz.jokiel@gmail.com>
Date:   Mon Jan 14 20:40:47 2013 +0100

    commit 1
Merge remote-tracking branch 'origin/master'