Merge remote-tracking branch 'gamato/develop'
authorMarko Kreen <markokr@gmail.com>
Wed, 31 Jul 2013 09:36:53 +0000 (12:36 +0300)
committerMarko Kreen <markokr@gmail.com>
Wed, 31 Jul 2013 09:36:53 +0000 (12:36 +0300)
commita914ecb16a943e6768b71acd38567bdc31be4811
treecb1620211b1087415dcc6a1aa8486397d0b7ed21
parent6549dab052d2bc60fddba08c99a08cafc81b3cfd
parent08e2f5df6c421b8a0d0244d5b8afa93f9f648cf3
Merge remote-tracking branch 'gamato/develop'