Merge branch 'master' into devel
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 7 Apr 2011 19:55:40 +0000 (21:55 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 7 Apr 2011 19:55:40 +0000 (21:55 +0200)
commita3f5f4bf70786172cde2dd59e11fa9cc453046b0
treefe7f578a3e920a729d0065f1ff2c89a586db159b
parent0aed6077f976b5587519e8c135e3390e01b46240
parentc5a333919058e3a1fe74617b901468d6a6cbb67b
Merge branch 'master' into devel