Merge remote-tracking branch 'petr/master'
authorMarko Kreen <markokr@gmail.com>
Fri, 18 Jan 2013 21:34:24 +0000 (23:34 +0200)
committerMarko Kreen <markokr@gmail.com>
Fri, 18 Jan 2013 21:34:24 +0000 (23:34 +0200)
commit47d033297969e21965af7524f07f67f2aedb9c46
tree882dec0370f1cdbb9ceba8591abff4230116a991
parent65e1aa1d21df0896bc0365098726790cc2bcce70
parent6893e281785d26218e90ac909bc502ee67408e58
Merge remote-tracking branch 'petr/master'