Merge branch 'master' into save_change
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 13:22:13 +0000 (15:22 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 13:22:13 +0000 (15:22 +0200)
commitd127fa1df7fe141da8127696b6750c5c169f357c
tree3326d3809fc859ca35eef761e95e5c5b96507e3a
parent2e6d14413341c393e2f39b3eae1c045ad9de8d17
parent7ed61a9315f839977660ff96c752b114bf780a60
Merge branch 'master' into save_change