Merge branch 'master' into save_change
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 10:54:40 +0000 (12:54 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 10:54:40 +0000 (12:54 +0200)
commit3b424526d012b5bd5b1212bcc996b41738b559b3
tree74a0367e68fb11d321d2a65a7e1015b978201a0f
parent64f03b0406514ce24e3f51ca412b09cfd3d3f1fd
parent33be29d43c2c1a97a359cf56276bb932e1fa5cf3
Merge branch 'master' into save_change