Merge remote-tracking branch 'origin/master' into rewrite-filter
authorHeikki Levanto <heikki@indexdata.dk>
Thu, 13 Jun 2013 10:16:03 +0000 (12:16 +0200)
committerHeikki Levanto <heikki@indexdata.dk>
Thu, 13 Jun 2013 10:16:03 +0000 (12:16 +0200)
commitc9d6971088c3b1a3a3faa658e54390c809852e16
tree4bca8cd0f12acf5718c846f8d7031f3deada858e
parenta370d3def5758d5f2d1d7113a27871655fc7cec5
parentffc8fc2e03a64fe20b84e0cd5e1fe722d84271ee
Merge remote-tracking branch 'origin/master' into rewrite-filter
src/Makefile.am
src/factory_static.cpp