Revision 9b974438cb634a03cb3f02ccc2776ade8407ac01

Committed on 16/10/2013 1:11 am by Alex Pilyavskiy <spi@nxc.no> [GitHub Diff]

resolve conflicts