Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <markokr@gmail.com>
Sat, 23 Feb 2013 13:17:00 +0000 (15:17 +0200)
committerMarko Kreen <markokr@gmail.com>
Sat, 23 Feb 2013 13:17:00 +0000 (15:17 +0200)
commitc6a643a07170c0f6060efa9b1dbc85a3b1f95a07
tree461f710421282da0fb74b7a6893c54b11efd53f7
parentc3ffdc07b9103506c156264c4f5acc5dc7067e1c
parent92484db1f617b4a5dcccb3234a43d53514786eb6
Merge remote-tracking branch 'gamato/master'