Merge remote-tracking branch 'frassle/issue76' into develop
authorthefiddler <stapostol@gmail.com>
Tue, 1 Apr 2014 07:39:48 +0000 (09:39 +0200)
committerthefiddler <stapostol@gmail.com>
Tue, 1 Apr 2014 07:39:48 +0000 (09:39 +0200)
commit74cff79d64482786cb49c5487db1d8641f401cec
treea52cd70e2d1e8e94f23b93a40b006c3c3f4c27fe
parentd292d44b90dac1f239098647f289e1c723b8ec6a
parentfbe6cc0a314db3b8d4a378760d5706f0b2a7d5f3
Merge remote-tracking branch 'frassle/issue76' into develop