Merge branch 'master' into save_change
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 15:07:13 +0000 (17:07 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 15:07:13 +0000 (17:07 +0200)
commit88a9cd15dbf2667759e2a0d2e3cc040255ec2ba8
treee7e1f8a4c949b8e4c9c2d6b90cff62eeba2bde6f
parentd127fa1df7fe141da8127696b6750c5c169f357c
parent9fdde32a4ec3dfcec6be64d401213b1e190c0265
Merge branch 'master' into save_change