Merge branch 'feature-option-o'
authorKai Dietrich <mail@cleeus.de>
Sun, 15 May 2011 18:45:38 +0000 (20:45 +0200)
committerKai Dietrich <mail@cleeus.de>
Sun, 15 May 2011 18:45:38 +0000 (20:45 +0200)
commit9b49fd44706f1ca33610a257733238e9b3c2751d
tree44bcada205fd6008603182b61f16b612b96adff1
parentf01a629bf38d8901359ea69d3162e7be35a5b6b4
parent9c8153ef643f3e968f6c6799517c0ef6c2126290
Merge branch 'feature-option-o'